Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 25375 invoked from network); 22 Mar 2010 20:09:58 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 22 Mar 2010 20:09:58 -0000 Received: (qmail 29460 invoked by uid 500); 22 Mar 2010 20:09:58 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 29440 invoked by uid 500); 22 Mar 2010 20:09:58 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 29431 invoked by uid 99); 22 Mar 2010 20:09:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Mar 2010 20:09:58 +0000 X-ASF-Spam-Status: No, hits=-1122.5 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Mar 2010 20:09:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DF1E32388978; Mon, 22 Mar 2010 20:09:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r926302 - in /activemq/activemq-cpp/trunk/activemq-cpp/src: examples/advisories/ main/activemq/transport/ main/activemq/transport/inactivity/ main/cms/ main/decaf/internal/ main/decaf/internal/net/ main/decaf/io/ main/decaf/lang/ main/decaf... Date: Mon, 22 Mar 2010 20:09:35 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100322200935.DF1E32388978@eris.apache.org> Author: tabish Date: Mon Mar 22 20:09:34 2010 New Revision: 926302 URL: http://svn.apache.org/viewvc?rev=926302&view=rev Log: Fix several warnings generated when the GCC -Weffc++ warning is enabled, also fix some things that the Windows Compiler was unhappy about. Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSException.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIType.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URISyntaxException.h activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.cpp Mon Mar 22 20:09:34 2010 @@ -39,7 +39,8 @@ using namespace decaf::lang; using namespace decaf::lang::exceptions; //////////////////////////////////////////////////////////////////////////////// -TempDestinationAdvisoryConsumer::TempDestinationAdvisoryConsumer( cms::Session* session ) { +TempDestinationAdvisoryConsumer::TempDestinationAdvisoryConsumer( cms::Session* session ) + : session( session ), consumer() { if( session == NULL ) { throw NullPointerException( @@ -49,7 +50,6 @@ TempDestinationAdvisoryConsumer::TempDes std::auto_ptr advisories( session->createTopic( "ActiveMQ.Advisory.TempTopic,ActiveMQ.Advisory.TempQueue" ) ); - this->session = session; this->consumer.reset( session->createConsumer( advisories.get() ) ); this->consumer->setMessageListener( this ); } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/examples/advisories/TempDestinationAdvisoryConsumer.h Mon Mar 22 20:09:34 2010 @@ -43,6 +43,11 @@ namespace advisories { cms::Session* session; std::auto_ptr consumer; + protected: + + TempDestinationAdvisoryConsumer( const TempDestinationAdvisoryConsumer& ); + TempDestinationAdvisoryConsumer operator= ( const TempDestinationAdvisoryConsumer& ); + public: TempDestinationAdvisoryConsumer( cms::Session* session ); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/TransportFilter.h Mon Mar 22 20:09:34 2010 @@ -67,6 +67,11 @@ namespace transport{ */ void fire( const Pointer& command ); + protected: + + TransportFilter( const TransportFilter& ); + TransportFilter operator= ( const TransportFilter& ); + public: /** Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.cpp Mon Mar 22 20:09:34 2010 @@ -210,6 +210,7 @@ InactivityMonitor::InactivityMonitor( co InactivityMonitor::~InactivityMonitor() { try{ this->stopMonitorThreads(); + delete this->members; } AMQ_CATCHALL_NOTHROW() } Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/transport/inactivity/InactivityMonitor.h Mon Mar 22 20:09:34 2010 @@ -47,7 +47,7 @@ namespace inactivity { private: // Internal Class used to house the data structures for this object - Pointer members; + InactivityMonitorData* members; friend class ReadChecker; friend class AsyncSignalReadErrorkTask; Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSException.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSException.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSException.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/CMSException.h Mon Mar 22 20:09:34 2010 @@ -127,16 +127,18 @@ namespace cms{ */ virtual const char* what() const throw(); - protected: + private: /** * Overridden assignment operator. We don't allow CMSExceptions to be assigned to one - * another so this method is left unimplemented. + * another so this method is hidden. * * @param other * The CMSException to assign to this instance. */ - CMSException& operator= ( const cms::CMSException& other ); + CMSException& operator= ( const cms::CMSException& ) { + return *this; + } }; Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.cpp Mon Mar 22 20:09:34 2010 @@ -48,7 +48,7 @@ namespace internal{ //////////////////////////////////////////////////////////////////////////////// DecafRuntime::DecafRuntime() { - this->runtimeData.reset( new RuntimeData() ); + this->runtimeData = new RuntimeData(); // Initializes the APR Runtime from within a library. apr_initialize(); @@ -61,11 +61,19 @@ DecafRuntime::DecafRuntime() { //////////////////////////////////////////////////////////////////////////////// DecafRuntime::~DecafRuntime() { - // Destroy the Global Thread Memory Pool - apr_pool_destroy( this->runtimeData->aprPool ); + try{ - // Cleans up APR data structures. - apr_terminate(); + // Destroy the Global Thread Memory Pool + apr_pool_destroy( this->runtimeData->aprPool ); + + // Cleans up APR data structures. + apr_terminate(); + + // Destroy the Runtime Data + delete this->runtimeData; + } + DECAF_CATCH_NOTHROW( Exception ) + DECAF_CATCHALL_NOTHROW() } //////////////////////////////////////////////////////////////////////////////// Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h Mon Mar 22 20:09:34 2010 @@ -21,7 +21,6 @@ #include #include -#include #include namespace decaf { @@ -35,7 +34,7 @@ namespace internal { class DECAF_API DecafRuntime : public decaf::lang::Runtime { private: - std::auto_ptr runtimeData; + RuntimeData* runtimeData; public: Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIType.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIType.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIType.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/URIType.h Mon Mar 22 20:09:34 2010 @@ -48,20 +48,36 @@ namespace net { public: - URIType( const std::string& source ) : source( source ) { - this->port = -1; - this->opaque = false; - this->absolute = false; - this->serverAuthority = false; - this->valid = false; - } - - URIType() { - this->port = -1; - this->opaque = false; - this->absolute = false; - this->serverAuthority = false; - this->valid = false; + URIType( const std::string& source ) : source( source ), + scheme(), + schemeSpecificPart(), + authority(), + userinfo(), + host(), + port( -1 ), + path(), + query(), + fragment(), + opaque( false ), + absolute( false ), + serverAuthority( false ), + valid( false ) { + } + + URIType() : source(), + scheme(), + schemeSpecificPart(), + authority(), + userinfo(), + host(), + port( -1 ), + path(), + query(), + fragment(), + opaque( false ), + absolute( false ), + serverAuthority( false ), + valid( false ) { } virtual ~URIType() {} Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp Mon Mar 22 20:09:34 2010 @@ -77,7 +77,7 @@ void ByteArrayInputStream::setByteArray( // Remove old data this->defaultBuffer.clear(); - this->defaultBuffer.reserve( bufferSize ); + this->defaultBuffer.reserve( (std::size_t)bufferSize ); // Copy data to internal buffer. this->defaultBuffer.insert( this->defaultBuffer.begin(), buffer, buffer + bufferSize ); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h Mon Mar 22 20:09:34 2010 @@ -47,6 +47,11 @@ namespace io{ // Indicates that this stream was closed volatile bool closed; + protected: + + FilterInputStream( const FilterInputStream& ); + FilterInputStream& operator= ( const FilterInputStream& ); + public: /** Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.cpp Mon Mar 22 20:09:34 2010 @@ -20,6 +20,8 @@ #include #include +#include + using namespace decaf; using namespace decaf::io; using namespace decaf::lang; Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterOutputStream.h Mon Mar 22 20:09:34 2010 @@ -58,6 +58,11 @@ namespace io{ // Indicates that this stream was closed volatile bool closed; + protected: + + FilterOutputStream( const FilterOutputStream& ); + FilterOutputStream& operator= ( const FilterOutputStream& ); + public: /** Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.cpp Mon Mar 22 20:09:34 2010 @@ -291,29 +291,29 @@ Thread* Thread::createForeignThreadInsta } //////////////////////////////////////////////////////////////////////////////// -Thread::Thread() { +Thread::Thread() : Runnable(), properties( NULL ) { this->initialize( this, "" ); } //////////////////////////////////////////////////////////////////////////////// -Thread::Thread( Runnable* task ) { +Thread::Thread( Runnable* task ): Runnable(), properties( NULL ) { this->initialize( task, "" ); } //////////////////////////////////////////////////////////////////////////////// -Thread::Thread( const std::string& name ) { +Thread::Thread( const std::string& name ): Runnable(), properties( NULL ) { this->initialize( this, name ); } //////////////////////////////////////////////////////////////////////////////// -Thread::Thread( Runnable* task, const std::string& name ) { +Thread::Thread( Runnable* task, const std::string& name ): Runnable(), properties( NULL ) { this->initialize( task, name ); } //////////////////////////////////////////////////////////////////////////////// void Thread::initialize( Runnable* task, const std::string& name ) { - this->properties.reset( new ThreadProperties() ); + this->properties = new ThreadProperties(); if( name == "" ) { this->properties->name = std::string( "Thread-" ) + Integer::toString( ++ThreadProperties::id ); @@ -330,6 +330,11 @@ void Thread::initialize( Runnable* task, //////////////////////////////////////////////////////////////////////////////// Thread::~Thread() { + try{ + delete this->properties; + } + DECAF_CATCH_NOTHROW( Exception ) + DECAF_CATCHALL_NOTHROW() } //////////////////////////////////////////////////////////////////////////////// @@ -359,7 +364,7 @@ void Thread::start() throw ( decaf::lang #ifdef HAVE_PTHREAD_H int result = pthread_create( &( properties->handle ), &( properties->attributes ), - threadWorker, properties.get() ); + threadWorker, properties ); if( result != 0 ) { throw RuntimeException( @@ -373,7 +378,7 @@ void Thread::start() throw ( decaf::lang #ifndef _WIN32_WCE properties->handle = (HANDLE)_beginthreadex( - NULL, (DWORD)0, threadWorker, properties.get(), 0, &threadId ); + NULL, (DWORD)0, threadWorker, properties, 0, &threadId ); #else Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Thread.h Mon Mar 22 20:09:34 2010 @@ -23,7 +23,6 @@ #include #include #include -#include #include namespace decaf{ @@ -70,7 +69,7 @@ namespace lang{ /** * The internal data necessary to manage a Thread instance. */ - decaf::lang::Pointer properties; + ThreadProperties* properties; public: @@ -133,6 +132,11 @@ namespace lang{ }; + protected: + + Thread( const Thread& ); + Thread& operator= ( const Thread& ); + public: /** Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URISyntaxException.h URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URISyntaxException.h?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URISyntaxException.h (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/URISyntaxException.h Mon Mar 22 20:09:34 2010 @@ -51,12 +51,10 @@ namespace net{ * Copy Constructor * @param ex An exception that should become this type of Exception */ - URISyntaxException( const URISyntaxException& ex ) throw() : Exception() { + URISyntaxException( const URISyntaxException& ex ) throw() + : Exception(), reason( ex.getReason() ), input( ex.getInput() ), index( ex.getIndex() ) { *(Exception*)this = ex; - this->reason = ex.getReason(); - this->input = ex.getInput(); - this->index = ex.getIndex(); } /** Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Deflater.cpp Mon Mar 22 20:09:34 2010 @@ -382,7 +382,7 @@ int Deflater::deflate( unsigned char* bu __FILE__, __LINE__, "length parameter out of Bounds: %d.", length ); } - ulong outStart = this->data->stream->total_out; + unsigned long outStart = this->data->stream->total_out; this->data->stream->next_out = buffer + offset; this->data->stream->avail_out = (uInt)length; Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp?rev=926302&r1=926301&r2=926302&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/Inflater.cpp Mon Mar 22 20:09:34 2010 @@ -340,7 +340,7 @@ int Inflater::inflate( unsigned char* bu __FILE__, __LINE__, "length parameter out of Bounds: %d.", length ); } - ulong outStart = this->data->stream->total_out; + unsigned long outStart = this->data->stream->total_out; this->data->stream->next_out = buffer + offset; this->data->stream->avail_out = (uInt)length;