Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 74333 invoked from network); 21 Jan 2007 01:04:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2007 01:04:57 -0000 Received: (qmail 47966 invoked by uid 500); 21 Jan 2007 01:05:03 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 47941 invoked by uid 500); 21 Jan 2007 01:05:03 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 47932 invoked by uid 99); 21 Jan 2007 01:05:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jan 2007 17:05:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jan 2007 17:04:55 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 91B151A9820; Sat, 20 Jan 2007 17:03:49 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r498226 [2/2] - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp: ./ src/examples/ src/main/ src/main/activemq/concurrent/ src/main/activemq/connector/ src/main/activemq/connector/openwire/commands/ src/main/activemq/connector/openwir... Date: Sun, 21 Jan 2007 01:03:46 -0000 To: activemq-commits@geronimo.apache.org From: nmittler@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070121010349.91B151A9820@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/EOFException.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/EOFException.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/EOFException.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/EOFException.h Sat Jan 20 17:03:42 2007 @@ -39,7 +39,9 @@ * Copy Constructor * @param ex the exception to copy */ - EOFException( const exceptions::ActiveMQException& ex ){ + EOFException( const exceptions::ActiveMQException& ex ) + : IOException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -47,7 +49,9 @@ * Copy Constructor * @param ex the exception to copy, which is an instance of this type */ - EOFException( const EOFException& ex ){ + EOFException( const EOFException& ex ) + : IOException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -59,6 +63,7 @@ */ EOFException( const char* file, const int lineNumber, const char* msg, ... ) + : IOException() { va_list vargs; va_start( vargs, msg ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/IOException.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/IOException.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/IOException.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/IOException.h Sat Jan 20 17:03:42 2007 @@ -38,7 +38,9 @@ * Copy Constructor * @param ex the exception to copy */ - IOException( const exceptions::ActiveMQException& ex ){ + IOException( const exceptions::ActiveMQException& ex ) + : exceptions::ActiveMQException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -46,7 +48,9 @@ * Copy Constructor * @param ex the exception to copy, which is an instance of this type */ - IOException( const IOException& ex ){ + IOException( const IOException& ex ) + : exceptions::ActiveMQException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -58,6 +62,7 @@ */ IOException( const char* file, const int lineNumber, const char* msg, ... ) + : exceptions::ActiveMQException() { va_list vargs; va_start( vargs, msg ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/InputStream.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/InputStream.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/InputStream.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/InputStream.h Sat Jan 20 17:03:42 2007 @@ -21,6 +21,7 @@ #include #include #include +#include namespace activemq{ namespace io{ @@ -80,9 +81,7 @@ * @returns total butes skipped * @throws IOException if an error occurs */ - virtual int skip( int num ) throw ( io::IOException ) { - return 0; - }; + virtual int skip( int num ) throw ( io::IOException, exceptions::UnsupportedOperationException ) = 0; }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogManager.cpp Sat Jan 20 17:03:42 2007 @@ -18,6 +18,7 @@ #include #include +#include #include @@ -65,13 +66,13 @@ } //////////////////////////////////////////////////////////////////////////////// -Logger* LogManager::getLogger( const std::string& name ) +Logger* LogManager::getLogger( const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; } //////////////////////////////////////////////////////////////////////////////// -int LogManager::getLoggerNames( const std::vector& names ) +int LogManager::getLoggerNames( const std::vector& names ACTIVEMQ_ATTRIBUTE_UNUSED) { return 0; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogRecord.h Sat Jan 20 17:03:42 2007 @@ -101,7 +101,7 @@ * Sets the Source Log File Name * @param loggerName the source loggers name */ - void setSourceFile( const std::string& loggerName ) { + void setSourceFile( const std::string& sourceFile ) { this->sourceFile = sourceFile; }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/LogWriter.cpp Sat Jan 20 17:03:42 2007 @@ -20,6 +20,7 @@ #include #include #include +#include using namespace activemq; using namespace activemq::logger; @@ -40,8 +41,8 @@ } //////////////////////////////////////////////////////////////////////////////// -void LogWriter::log(const std::string& file, - const int line, +void LogWriter::log(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, const std::string& prefix, const std::string& message) { Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/logger/Logger.cpp Sat Jan 20 17:03:42 2007 @@ -17,6 +17,7 @@ #include "Logger.h" #include +#include #include using namespace std; @@ -25,7 +26,8 @@ using namespace activemq::exceptions; //////////////////////////////////////////////////////////////////////////////// -Logger::Logger(const std::string& name, Logger* parent) +Logger::Logger( const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, + Logger* parent ACTIVEMQ_ATTRIBUTE_UNUSED ) { } @@ -65,99 +67,100 @@ } //////////////////////////////////////////////////////////////////////////////// -void Logger::setFilter(Filter* filter) +void Logger::setFilter( Filter* filter ACTIVEMQ_ATTRIBUTE_UNUSED ) { } //////////////////////////////////////////////////////////////////////////////// -bool Logger::isLoggable(Level level) const +bool Logger::isLoggable( Level level ACTIVEMQ_ATTRIBUTE_UNUSED ) const { return false; } //////////////////////////////////////////////////////////////////////////////// -void Logger::entry(const std::string& blockName, - const std::string& file, - const int line) +void Logger::entry(const std::string& blockName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::exit(const std::string& blockName, - const std::string& file, - const int line) +void Logger::exit(const std::string& blockName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::debug(const std::string& file, - const int line, - const std::string fnctionName, - const std::string& message) +void Logger::debug(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::info(const std::string& file, - const int line, - const std::string fnctionName, - const std::string& message) +void Logger::info(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::error(const std::string& file, - const int line, - const std::string fnctionName, - const std::string& message) +void Logger::error(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::warn(const std::string& file, - const int line, - const std::string fnctionName, - const std::string& message) +void Logger::warn(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::fatal(const std::string& file, - const int line, - const std::string fnctionName, - const std::string& message) +void Logger::fatal(const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string fnctionName ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::log(Level level, const std::string& message) +void Logger::log( Level level ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::log(Level level, - const std::string& file, - const int line, - const std::string& message, - cms::CMSException& ex) +void Logger::log(Level level ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED, + cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::log(Level level, - const std::string& file, - const int line, - const std::string& message, ...) +void Logger::log(Level level ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& file ACTIVEMQ_ATTRIBUTE_UNUSED, + const int line ACTIVEMQ_ATTRIBUTE_UNUSED, + const std::string& message ACTIVEMQ_ATTRIBUTE_UNUSED, ...) { } //////////////////////////////////////////////////////////////////////////////// -void Logger::log(LogRecord& record) +void Logger::log(LogRecord& record ACTIVEMQ_ATTRIBUTE_UNUSED) { } //////////////////////////////////////////////////////////////////////////////// -Logger* Logger::getLogger(const std::string& name) +Logger* Logger::getLogger(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketException.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketException.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketException.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketException.h Sat Jan 20 17:03:42 2007 @@ -30,14 +30,19 @@ public: SocketException(){} - SocketException( const ActiveMQException& ex ){ + SocketException( const ActiveMQException& ex ) + : io::IOException() + { *(ActiveMQException*)this = ex; } - SocketException( const SocketException& ex ){ + SocketException( const SocketException& ex ) + : io::IOException() + { *(ActiveMQException*)this = ex; } SocketException( const char* file, const int lineNumber, const char* msg, ...) + : io::IOException() { va_list vargs; va_start(vargs, msg); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.cpp Sat Jan 20 17:03:42 2007 @@ -185,3 +185,11 @@ return len; } + +//////////////////////////////////////////////////////////////////////////////// +int SocketInputStream::skip( int num ACTIVEMQ_ATTRIBUTE_UNUSED ) +throw ( io::IOException, exceptions::UnsupportedOperationException ) { + throw exceptions::UnsupportedOperationException(__FILE__, __LINE__, + "skip() method is not supported"); +} + Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/network/SocketInputStream.h Sat Jan 20 17:03:42 2007 @@ -152,6 +152,12 @@ */ virtual void close() throw( cms::CMSException ){} + /** + * Not supported. + * @throws an UnsupportedOperationException. + */ + virtual int skip( int num ) throw ( io::IOException, exceptions::UnsupportedOperationException ); + }; }} Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/BrokerError.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/BrokerError.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/BrokerError.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/BrokerError.h Sat Jan 20 17:03:42 2007 @@ -40,7 +40,9 @@ * Copy Constructor * @param ex the exception to copy */ - BrokerError( const exceptions::ActiveMQException& ex ){ + BrokerError( const exceptions::ActiveMQException& ex ) + : exceptions::ActiveMQException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -48,7 +50,9 @@ * Copy Constructor * @param ex the exception to copy, which is an instance of this type */ - BrokerError( const BrokerError& ex ){ + BrokerError( const BrokerError& ex ) + : exceptions::ActiveMQException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -60,6 +64,7 @@ */ BrokerError(const char* file, const int lineNumber, const char* msg, ...) + : exceptions::ActiveMQException() { va_list vargs ; va_start(vargs, msg) ; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/CommandIOException.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/CommandIOException.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/CommandIOException.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/CommandIOException.h Sat Jan 20 17:03:42 2007 @@ -36,7 +36,9 @@ * Copy Constructor * @param ex the exception to copy */ - CommandIOException( const exceptions::ActiveMQException& ex ){ + CommandIOException( const exceptions::ActiveMQException& ex ) + : io::IOException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -44,7 +46,9 @@ * Copy Constructor * @param ex the exception to copy, which is an instance of this type */ - CommandIOException( const CommandIOException& ex ){ + CommandIOException( const CommandIOException& ex ) + : io::IOException() + { *(exceptions::ActiveMQException*)this = ex; } @@ -56,6 +60,7 @@ */ CommandIOException( const char* file, const int lineNumber, const char* msg, ... ) + : io::IOException() { va_list vargs; va_start( vargs, msg ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.cpp Sat Jan 20 17:03:42 2007 @@ -21,6 +21,7 @@ #include #include +#include using namespace activemq; using namespace activemq::transport; @@ -175,5 +176,11 @@ fire( ex ); } +} + +//////////////////////////////////////////////////////////////////////////////// +Response* IOTransport::request( Command* command ACTIVEMQ_ATTRIBUTE_UNUSED ) +throw( CommandIOException, exceptions::UnsupportedOperationException ){ + throw exceptions::UnsupportedOperationException( __FILE__, __LINE__, "IOTransport::request() - unsupported operation" ); } Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransport.h Sat Jan 20 17:03:42 2007 @@ -149,9 +149,7 @@ * @returns the response to the command sent. * @throws UnsupportedOperationException. */ - virtual Response* request( Command* command ) throw( CommandIOException, exceptions::UnsupportedOperationException ){ - throw exceptions::UnsupportedOperationException( __FILE__, __LINE__, "IOTransport::request() - unsupported operation" ); - } + virtual Response* request( Command* command ) throw( CommandIOException, exceptions::UnsupportedOperationException ); /** * Assigns the command listener for non-response commands. Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.cpp Sat Jan 20 17:03:42 2007 @@ -16,9 +16,17 @@ */ #include "IOTransportFactory.h" +#include using namespace activemq::transport; +//////////////////////////////////////////////////////////////////////////////// +Transport* IOTransportFactory::createTransport( + const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED ) +{ + return new IOTransport(); +} + //////////////////////////////////////////////////////////////////////////////// TransportFactory& IOTransportFactory::getInstance(void) { Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/IOTransportFactory.h Sat Jan 20 17:03:42 2007 @@ -43,10 +43,7 @@ * @param properties The properties for the transport. */ virtual Transport* createTransport( - const activemq::util::Properties& properties ) - { - return new IOTransport(); - } + const activemq::util::Properties& properties ); /** * Returns a reference to this TransportFactory Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.cpp Sat Jan 20 17:03:42 2007 @@ -16,6 +16,7 @@ */ #include "TransportFactoryMap.h" +#include using namespace activemq::transport; using namespace std; @@ -38,6 +39,16 @@ factoryMap[name] = factory; } +//////////////////////////////////////////////////////////////////////////////// +TransportFactoryMap::TransportFactoryMap( +const TransportFactoryMap& factoryMap ACTIVEMQ_ATTRIBUTE_UNUSED ){ +} + +//////////////////////////////////////////////////////////////////////////////// +TransportFactoryMap& TransportFactoryMap::operator=( +const TransportFactoryMap& factoryMap ACTIVEMQ_ATTRIBUTE_UNUSED ){ + return *this; +} //////////////////////////////////////////////////////////////////////////////// void TransportFactoryMap::unregisterTransportFactory( const std::string& name ){ factoryMap.erase( name ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFactoryMap.h Sat Jan 20 17:03:42 2007 @@ -46,12 +46,10 @@ virtual ~TransportFactoryMap() {}; // Hidden Copy Constructore - TransportFactoryMap( const TransportFactoryMap& factoryMap ){}; + TransportFactoryMap( const TransportFactoryMap& factoryMap ); // Hidden Assignment operator - TransportFactoryMap& operator=( const TransportFactoryMap& factoryMap ){ - return *this; - } + TransportFactoryMap& operator=( const TransportFactoryMap& factoryMap ); public: Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h Sat Jan 20 17:03:42 2007 @@ -131,9 +131,7 @@ * @param source The source of the exception * @param ex The exception. */ - virtual void onTransportException( Transport* source, const exceptions::ActiveMQException& ex ){ - fire( ex ); - } + virtual void onTransportException( Transport* source, const exceptions::ActiveMQException& ex ); /** * Sends a one-way command. Does not wait for any response from the Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Config.h Sat Jan 20 17:03:42 2007 @@ -50,5 +50,12 @@ #endif /* !defined(HAVE_CONFIG_H) */ +// Macro to mark attributes as unused +#ifdef __GNUC__ + #define ACTIVEMQ_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) +#else + #define ACTIVEMQ_ATTRIBUTE_UNUSED +#endif + #endif /*ACTIVEMQ_UTIL_CONFIG_H_*/ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/integration/various/SimpleRollbackTest.cpp Sat Jan 20 17:03:42 2007 @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -197,7 +198,7 @@ AMQ_CATCHALL_THROW( ActiveMQException ) } -void SimpleRollbackTest::onException( const cms::CMSException& error ) +void SimpleRollbackTest::onException( const cms::CMSException& error ACTIVEMQ_ATTRIBUTE_UNUSED) { bool AbstractTester = false; CPPUNIT_ASSERT( AbstractTester ); Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/main.cpp Sat Jan 20 17:03:42 2007 @@ -19,9 +19,10 @@ #include #include #include +#include #include -int main( int argc, char **argv) +int main( int argc ACTIVEMQ_ATTRIBUTE_UNUSED, char **argv ACTIVEMQ_ATTRIBUTE_UNUSED) { try { Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/MutexTest.h Sat Jan 20 17:03:42 2007 @@ -362,8 +362,9 @@ public: - virtual void setUp(){}; - virtual void tearDown(){}; + virtual ~MutexTest(){} + virtual void setUp(){} + virtual void tearDown(){} void testTimedWait(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadPoolTest.h Sat Jan 20 17:03:42 2007 @@ -26,6 +26,7 @@ #include #include #include +#include namespace activemq{ namespace concurrent{ @@ -56,7 +57,7 @@ virtual ~ThreadPoolTest() {}; - virtual void onTaskComplete(Runnable* task) + virtual void onTaskComplete(Runnable* task ACTIVEMQ_ATTRIBUTE_UNUSED) { try{ synchronized(&mutex) @@ -73,7 +74,8 @@ } } - virtual void onTaskException(Runnable* task, exceptions::ActiveMQException& ex) + virtual void onTaskException(Runnable* task ACTIVEMQ_ATTRIBUTE_UNUSED, + exceptions::ActiveMQException& ex ACTIVEMQ_ATTRIBUTE_UNUSED) { caughtEx = true; } @@ -136,7 +138,7 @@ }; public: - + void test2() { try Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/concurrent/ThreadTest.h Sat Jan 20 17:03:42 2007 @@ -93,8 +93,9 @@ public: - virtual void setUp(){}; - virtual void tearDown(){}; + virtual ~ThreadTest(){} + virtual void setUp(){} + virtual void tearDown(){} void testDelegate(){ Delegate test; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapRegistrarTest.h Sat Jan 20 17:03:42 2007 @@ -21,6 +21,7 @@ #include #include +#include #include #include @@ -40,9 +41,11 @@ public: virtual Connector* createConnector( - const activemq::util::Properties& properties, - activemq::transport::Transport* transport) { return NULL; }; + const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED, + activemq::transport::Transport* transport ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; }; }; + + virtual ~ConnectorFactoryMapRegistrarTest(){} void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/ConnectorFactoryMapTest.h Sat Jan 20 17:03:42 2007 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -47,62 +48,64 @@ virtual SessionInfo* createSessionInfo(void) throw( ConnectorException ) { return NULL; }; - virtual cms::Topic* createTopic(const std::string& name, SessionInfo* session) + virtual cms::Topic* createTopic(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual cms::Queue* createQueue(const std::string& name, SessionInfo* session) + virtual cms::Queue* createQueue(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual cms::TemporaryTopic* createTemporaryTopic(const std::string& name, - SessionInfo* session) + virtual cms::TemporaryTopic* createTemporaryTopic(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, + SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual cms::TemporaryQueue* createTemporaryQueue(const std::string& name, - SessionInfo* session) + virtual cms::TemporaryQueue* createTemporaryQueue(const std::string& name ACTIVEMQ_ATTRIBUTE_UNUSED, + SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual void Send(cms::Message* message) throw ( ConnectorException ) {}; - virtual void Send(std::list& messages) + virtual void Send(cms::Message* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; + virtual void Send(std::list& messages ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; - virtual void Acknowledge(cms::Message* message) throw ( ConnectorException ) {}; - virtual TransactionInfo* startTransaction(SessionInfo* session) + virtual void Acknowledge(cms::Message* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; + virtual TransactionInfo* startTransaction(SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual void commit(TransactionInfo* transaction, SessionInfo* session) + virtual void commit(TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; - virtual void rollback(TransactionInfo* transaction, SessionInfo* session) + virtual void rollback(TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; - virtual cms::BytesMessage* createByteMessage(SessionInfo* session, - TransactionInfo* transaction) + virtual cms::BytesMessage* createByteMessage(SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED, + TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual cms::TextMessage* createTextMessage(SessionInfo* session, - TransactionInfo* transaction) + virtual cms::TextMessage* createTextMessage(SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED, + TransactionInfo* transaction ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) { return NULL; }; - virtual void subscribe(cms::Destination* destination, SessionInfo* session) + virtual void subscribe(cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; - virtual void unsubscribe(cms::Destination* destination, SessionInfo* session) + virtual void unsubscribe(cms::Destination* destination ACTIVEMQ_ATTRIBUTE_UNUSED, SessionInfo* session ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( ConnectorException ) {}; - virtual void addMessageListener(cms::MessageListener* listener) {}; - virtual void removeMessageListener(cms::MessageListener* listener) {}; - virtual void addExceptionListener(cms::ExceptionListener* listener) {}; - virtual void removeExceptionListener(cms::ExceptionListener* listener) {}; + virtual void addMessageListener(cms::MessageListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {}; + virtual void removeMessageListener(cms::MessageListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {}; + virtual void addExceptionListener(cms::ExceptionListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {}; + virtual void removeExceptionListener(cms::ExceptionListener* listener ACTIVEMQ_ATTRIBUTE_UNUSED) {}; }; public: + + virtual ~ConnectorFactoryMapTest(){} class TestConnectoryFactory : public ConnectorFactory { public: virtual Connector* createConnector( - const activemq::util::Properties& properties, - activemq::transport::Transport* transport) { return NULL; }; + const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED, + activemq::transport::Transport* transport ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; }; }; void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompConnectorTest.h Sat Jan 20 17:03:42 2007 @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -59,7 +60,7 @@ int num; MyExceptionListener(){ num=0;} virtual ~MyExceptionListener(){} - virtual void onException( const cms::CMSException& ex ){ + virtual void onException( const cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED){ num++; } }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/StompFrameTest.h Sat Jan 20 17:03:42 2007 @@ -36,7 +36,7 @@ public: - virtual ~StompFrameTest() {} + virtual ~StompFrameTest() {} void test() { Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h Sat Jan 20 17:03:42 2007 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -47,7 +48,7 @@ TestAckHandler() { wasAcked = false; } virtual ~TestAckHandler() {} - virtual void acknowledgeMessage( const core::ActiveMQMessage* message) + virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( cms::CMSException ) { wasAcked = true; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/MessageCommandTest.h Sat Jan 20 17:03:42 2007 @@ -24,6 +24,7 @@ #include #include #include +#include #include namespace activemq{ @@ -50,7 +51,7 @@ TestAckHandler(void) { wasAcked = false; } virtual ~TestAckHandler(void) {} - virtual void acknowledgeMessage( const core::ActiveMQMessage* message) + virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( cms::CMSException ) { wasAcked = true; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/connector/stomp/commands/TextMessageCommandTest.h Sat Jan 20 17:03:42 2007 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -45,7 +46,7 @@ TestAckHandler(void) { wasAcked = false; } virtual ~TestAckHandler(void) {} - virtual void acknowledgeMessage( const core::ActiveMQMessage* message) + virtual void acknowledgeMessage( const core::ActiveMQMessage* message ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( cms::CMSException ) { wasAcked = true; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQConnectionTest.h Sat Jan 20 17:03:42 2007 @@ -44,6 +44,7 @@ #include #include #include +#include namespace activemq{ namespace core{ @@ -88,7 +89,7 @@ virtual void onConsumerMessage( connector::ConsumerInfo* consumer, - core::ActiveMQMessage* msg ) + core::ActiveMQMessage* msg ACTIVEMQ_ATTRIBUTE_UNUSED ) { consumers.push_back( consumer ); } @@ -104,7 +105,7 @@ MyExceptionListener(){ caughtOne = false; } virtual ~MyExceptionListener(){} - virtual void onException(const cms::CMSException& ex){ + virtual void onException(const cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED){ caughtOne = true; } }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/core/ActiveMQSessionTest.h Sat Jan 20 17:03:42 2007 @@ -50,6 +50,7 @@ #include #include #include +#include namespace activemq{ namespace core{ @@ -92,7 +93,7 @@ MyExceptionListener(){ caughtOne = false; } virtual ~MyExceptionListener(){} - virtual void onException(const cms::CMSException& ex){ + virtual void onException(const cms::CMSException& ex ACTIVEMQ_ATTRIBUTE_UNUSED){ caughtOne = true; } }; Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/exceptions/ActiveMQExceptionTest.h Sat Jan 20 17:03:42 2007 @@ -36,6 +36,8 @@ public: + virtual ~ActiveMQExceptionTest(){} + virtual void setUp(){}; virtual void tearDown(){}; void testMessage0(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedInputStreamTest.h Sat Jan 20 17:03:42 2007 @@ -22,6 +22,7 @@ #include #include +#include namespace activemq{ @@ -75,6 +76,9 @@ virtual void close() throw(cms::CMSException){ // do nothing. } + virtual int skip( int num ACTIVEMQ_ATTRIBUTE_UNUSED) throw ( io::IOException, exceptions::UnsupportedOperationException ) { + return 0; + } virtual void lock() throw(exceptions::ActiveMQException){ } @@ -82,7 +86,7 @@ } virtual void wait() throw(exceptions::ActiveMQException){ } - virtual void wait(unsigned long millisecs) throw(exceptions::ActiveMQException){ + virtual void wait(unsigned long millisecs ACTIVEMQ_ATTRIBUTE_UNUSED) throw(exceptions::ActiveMQException){ } virtual void notify() throw(exceptions::ActiveMQException){ } @@ -92,6 +96,7 @@ public: + virtual ~BufferedInputStreamTest(){} virtual void setUp(){}; virtual void tearDown(){}; void testSmallerBuffer(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/BufferedOutputStreamTest.h Sat Jan 20 17:03:42 2007 @@ -23,6 +23,7 @@ #include #include +#include namespace activemq{ namespace io{ @@ -82,7 +83,7 @@ } virtual void wait() throw(exceptions::ActiveMQException){ } - virtual void wait(unsigned long millisecs) throw(exceptions::ActiveMQException){ + virtual void wait(unsigned long millisecs ACTIVEMQ_ATTRIBUTE_UNUSED) throw(exceptions::ActiveMQException){ } virtual void notify() throw(exceptions::ActiveMQException){ } @@ -92,6 +93,7 @@ public: + virtual ~BufferedOutputStreamTest(){} virtual void setUp(){}; virtual void tearDown(){}; void testSmallerBuffer(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataInputStreamTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataInputStreamTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataInputStreamTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataInputStreamTest.h Sat Jan 20 17:03:42 2007 @@ -44,6 +44,7 @@ public: + virtual ~DataInputStreamTest(){} virtual void setUp(){}; virtual void tearDown(){}; void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataOutputStreamTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataOutputStreamTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataOutputStreamTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/io/DataOutputStreamTest.h Sat Jan 20 17:03:42 2007 @@ -36,6 +36,7 @@ public: + virtual ~DataOutputStreamTest(){} virtual void setUp(){}; virtual void tearDown(){}; void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/network/SocketTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/network/SocketTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/network/SocketTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/network/SocketTest.h Sat Jan 20 17:03:42 2007 @@ -144,9 +144,7 @@ public: - virtual void setUp(){}; - virtual void tearDown(){ - }; + virtual ~SocketTest(){} void testConnect(){ try{ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/DummyTransport.h Sat Jan 20 17:03:42 2007 @@ -26,6 +26,7 @@ #include #include #include +#include namespace activemq{ namespace transport{ @@ -216,9 +217,9 @@ outgoingCommandListener = listener; } - virtual void setCommandReader( CommandReader* reader ){} + virtual void setCommandReader( CommandReader* reader ACTIVEMQ_ATTRIBUTE_UNUSED){} - virtual void setCommandWriter( CommandWriter* writer ){} + virtual void setCommandWriter( CommandWriter* writer ACTIVEMQ_ATTRIBUTE_UNUSED){} virtual void setTransportExceptionListener( TransportExceptionListener* listener ) Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/IOTransportTest.h Sat Jan 20 17:03:42 2007 @@ -32,6 +32,7 @@ #include #include #include +#include namespace activemq{ namespace transport{ @@ -54,10 +55,10 @@ char c; - virtual void setCommandId( const unsigned int id ){} + virtual void setCommandId( const unsigned int id ACTIVEMQ_ATTRIBUTE_UNUSED){} virtual unsigned int getCommandId() const{ return 0; } - virtual void setResponseRequired( const bool required ){} + virtual void setResponseRequired( const bool required ACTIVEMQ_ATTRIBUTE_UNUSED){} virtual bool isResponseRequired() const{ return false; } }; @@ -128,7 +129,8 @@ } } - virtual int read(unsigned char* buffer, int count) + virtual int read(unsigned char* buffer ACTIVEMQ_ATTRIBUTE_UNUSED, + int count ACTIVEMQ_ATTRIBUTE_UNUSED) throw( io::IOException ) { return 0; } @@ -174,10 +176,11 @@ } } - virtual void write(const unsigned char* buffer, int count) + virtual void write( const unsigned char* buffer ACTIVEMQ_ATTRIBUTE_UNUSED, + int count ACTIVEMQ_ATTRIBUTE_UNUSED) throw(io::IOException) {} - virtual void writeByte(unsigned char v) throw(io::IOException) {} + virtual void writeByte(unsigned char v ACTIVEMQ_ATTRIBUTE_UNUSED) throw(io::IOException) {} }; class MyExceptionListener : public TransportExceptionListener{ @@ -191,7 +194,8 @@ } virtual ~MyExceptionListener(){} - virtual void onTransportException( Transport* source, const exceptions::ActiveMQException& ex ){ + virtual void onTransportException( Transport* source, + const exceptions::ActiveMQException& ex ACTIVEMQ_ATTRIBUTE_UNUSED){ transport = source; synchronized(&mutex) @@ -203,8 +207,7 @@ public: - virtual void setUp(){}; - virtual void tearDown(){}; + virtual ~IOTransportTest(){} // This will just test that we can start and stop the // transport without any exceptions. Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/ResponseCorrelatorTest.h Sat Jan 20 17:03:42 2007 @@ -26,6 +26,7 @@ #include #include #include +#include #include namespace activemq{ @@ -172,7 +173,7 @@ } } - virtual Response* request( Command* command ) + virtual Response* request( Command* command ACTIVEMQ_ATTRIBUTE_UNUSED) throw(CommandIOException, exceptions::UnsupportedOperationException) { throw exceptions::UnsupportedOperationException( @@ -308,7 +309,7 @@ MyBrokenTransport(){} virtual ~MyBrokenTransport(){} - virtual Response* createResponse( Command* command ){ + virtual Response* createResponse( Command* command ACTIVEMQ_ATTRIBUTE_UNUSED){ throw exceptions::ActiveMQException( __FILE__, __LINE__, "bad stuff" ); } @@ -341,8 +342,8 @@ } virtual void onTransportException( - Transport* source, - const exceptions::ActiveMQException& ex ) + Transport* source ACTIVEMQ_ATTRIBUTE_UNUSED, + const exceptions::ActiveMQException& ex ACTIVEMQ_ATTRIBUTE_UNUSED) { synchronized( &mutex ){ exCount++; @@ -387,8 +388,7 @@ public: - virtual void setUp(){}; - virtual void tearDown(){}; + virtual ~ResponseCorrelatorTest(){} void testBasics(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapRegistrarTest.h Sat Jan 20 17:03:42 2007 @@ -23,6 +23,7 @@ #include #include +#include namespace activemq{ namespace transport{ @@ -40,8 +41,10 @@ public: virtual Transport* createTransport( - const activemq::util::Properties& properties ) { return NULL; }; + const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED ) { return NULL; }; }; + + virtual ~TransportFactoryMapRegistrarTest(){} void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/transport/TransportFactoryMapTest.h Sat Jan 20 17:03:42 2007 @@ -23,6 +23,7 @@ #include #include +#include namespace activemq{ namespace transport{ @@ -40,8 +41,10 @@ public: virtual Transport* createTransport( - const activemq::util::Properties& properties) { return NULL; }; + const activemq::util::Properties& properties ACTIVEMQ_ATTRIBUTE_UNUSED) { return NULL; }; }; + + virtual ~TransportFactoryMapTest(){} void test(){ Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/main.cpp URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/main.cpp?view=diff&rev=498226&r1=498225&r2=498226 ============================================================================== --- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/main.cpp (original) +++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/main.cpp Sat Jan 20 17:03:42 2007 @@ -19,8 +19,9 @@ #include #include #include +#include -int main( int argc, char **argv) +int main( int argc ACTIVEMQ_ATTRIBUTE_UNUSED, char **argv ACTIVEMQ_ATTRIBUTE_UNUSED) { CppUnit::TextUi::TestRunner runner; CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry();