Author: tabish
Date: Sat Dec 18 00:00:48 2010
New Revision: 1050537
URL: http://svn.apache.org/viewvc?rev=1050537&view=rev
Log:
Fix a bunch of warnings that get shown with various versions of GCC especially
if you turn on -Weffc++
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/AprPool.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/DecafRuntime.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/Network.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/security/SecureRandom.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Mutex.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/PooledThread.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Semaphore.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/Handler.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/LogRecord.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/StreamHandler.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/AprPool.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/AprPool.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/AprPool.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/AprPool.cpp
Sat Dec 18 00:00:48 2010
@@ -23,8 +23,7 @@ using namespace decaf::lang;
using namespace decaf::internal;
////////////////////////////////////////////////////////////////////////////////
-AprPool::AprPool() {
- aprPool = NULL;
+AprPool::AprPool() : aprPool(NULL) {
}
////////////////////////////////////////////////////////////////////////////////
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=1050537&r1=1050536&r2=1050537&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
Sat Dec 18 00:00:48 2010
@@ -37,6 +37,11 @@ namespace internal {
RuntimeData* runtimeData;
+ private:
+
+ DecafRuntime( const DecafRuntime& );
+ DecafRuntime& operator= ( const DecafRuntime& );
+
public:
/**
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/Network.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/Network.h?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/Network.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/net/Network.h
Sat Dec 18 00:00:48 2010
@@ -43,6 +43,11 @@ namespace net {
static Network* networkRuntime;
+ private:
+
+ Network( const Network& );
+ Network& operator= ( const Network& );
+
protected:
Network();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h
Sat Dec 18 00:00:48 2010
@@ -41,6 +41,11 @@ namespace net{
static SocketFactory* defaultFactory;
+ private:
+
+ SocketFactory( const SocketFactory& );
+ SocketFactory& operator= ( const SocketFactory& );
+
protected:
SocketFactory();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.h?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.h
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.h
Sat Dec 18 00:00:48 2010
@@ -62,6 +62,11 @@ namespace net {
*/
io::FileDescriptor* fd;
+ private:
+
+ SocketImpl( const SocketImpl& );
+ SocketImpl& operator= ( const SocketImpl& );
+
public:
SocketImpl();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/security/SecureRandom.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/security/SecureRandom.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/security/SecureRandom.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/security/SecureRandom.cpp
Sat Dec 18 00:00:48 2010
@@ -34,14 +34,12 @@ using namespace decaf::internal;
using namespace decaf::internal::security;
////////////////////////////////////////////////////////////////////////////////
-SecureRandom::SecureRandom() {
- this->secureRandom.reset( new SecureRandomImpl() );
+SecureRandom::SecureRandom() : secureRandom(new SecureRandomImpl()) {
}
////////////////////////////////////////////////////////////////////////////////
-SecureRandom::SecureRandom( const std::vector<unsigned char>& seed ) {
-
- this->secureRandom.reset( new SecureRandomImpl() );
+SecureRandom::SecureRandom( const std::vector<unsigned char>& seed ) :
+ secureRandom(new SecureRandomImpl()) {
if( !seed.empty() ) {
this->secureRandom->providerSetSeed( &seed[0], (int)seed.size() );
@@ -49,7 +47,8 @@ SecureRandom::SecureRandom( const std::v
}
////////////////////////////////////////////////////////////////////////////////
-SecureRandom::SecureRandom( const unsigned char* seed, int size ) {
+SecureRandom::SecureRandom( const unsigned char* seed, int size ) :
+ secureRandom(new SecureRandomImpl()) {
if( seed == NULL ) {
throw NullPointerException( __FILE__, __LINE__, "Seed buffer pointer
passed was NULL" );
@@ -59,8 +58,6 @@ SecureRandom::SecureRandom( const unsign
throw IllegalArgumentException( __FILE__, __LINE__, "Passed buffer
size was negative." );
}
- this->secureRandom.reset( new SecureRandomImpl() );
-
if( size > 0 ) {
this->secureRandom->providerSetSeed( seed, size );
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Mutex.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Mutex.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Mutex.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Mutex.cpp
Sat Dec 18 00:00:48 2010
@@ -38,6 +38,11 @@ namespace util{
namespace concurrent{
class MutexProperties {
+ private:
+
+ MutexProperties( const MutexProperties& );
+ MutexProperties& operator= ( const MutexProperties& );
+
public:
MutexProperties( const std::string& name ) : mutex( NULL ), condition(
NULL ), name( name ) {
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/PooledThread.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/PooledThread.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/PooledThread.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/PooledThread.cpp
Sat Dec 18 00:00:48 2010
@@ -31,24 +31,16 @@ using namespace decaf::util::concurrent;
LOGDECAF_INITIALIZE(logger, PooledThread,
"com.activemq.concurrent.PooledThread")
////////////////////////////////////////////////////////////////////////////////
-PooledThread::PooledThread(ThreadPool* pool) {
+PooledThread::PooledThread(ThreadPool* pool) : busy(false), done(false),
listener(NULL), pool(pool) {
if( pool == NULL ) {
throw IllegalArgumentException( __FILE__, __LINE__,
"PooledThread::PooledThread");
}
-
- busy = false;
- done = false;
-
- listener = NULL;
-
- // Store our Pool.
- this->pool = pool;
}
////////////////////////////////////////////////////////////////////////////////
-PooledThread::~PooledThread(){
+PooledThread::~PooledThread() {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Semaphore.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Semaphore.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Semaphore.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/Semaphore.cpp
Sat Dec 18 00:00:48 2010
@@ -50,13 +50,11 @@ namespace concurrent {
}}}
////////////////////////////////////////////////////////////////////////////////
-Semaphore::Semaphore( int permits ) {
- this->handle.reset( new SemaphoreHandle( permits ) );
+Semaphore::Semaphore( int permits ) : handle(new SemaphoreHandle( permits )) {
}
////////////////////////////////////////////////////////////////////////////////
-Semaphore::Semaphore( int permits, bool fair ) {
- this->handle.reset( new SemaphoreHandle( permits, fair ) );
+Semaphore::Semaphore( int permits, bool fair ) : handle(new SemaphoreHandle(
permits, fair )) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.cpp
Sat Dec 18 00:00:48 2010
@@ -58,9 +58,7 @@ const long long TimeUnit::multipliers[]
};
////////////////////////////////////////////////////////////////////////////////
-TimeUnit::TimeUnit( int index, const std::string& name ) {
- this->index = index;
- this->name = name;
+TimeUnit::TimeUnit( int index, const std::string& name ) : index(index),
name(name) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.h?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/TimeUnit.h
Sat Dec 18 00:00:48 2010
@@ -65,12 +65,12 @@ namespace concurrent {
/** This TimeUnit's index */
int index;
- /** Array of Time Unit multipliers */
- static const long long multipliers[];
-
/** Name of the Unit being represented. */
std::string name;
+ /** Array of Time Unit multipliers */
+ static const long long multipliers[];
+
public:
/** The Actual TimeUnit enumerations */
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/atomic/AtomicBoolean.cpp
Sat Dec 18 00:00:48 2010
@@ -31,8 +31,7 @@ AtomicBoolean::AtomicBoolean() : value(0
}
////////////////////////////////////////////////////////////////////////////////
-AtomicBoolean::AtomicBoolean( bool initialValue ) {
- this->value = initialValue ? 1 : 0;
+AtomicBoolean::AtomicBoolean( bool initialValue ) : value(initialValue ? 1 :
0) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.cpp
Sat Dec 18 00:00:48 2010
@@ -67,6 +67,11 @@ namespace locks{
* the supported platforms.
*/
class LockHandle {
+ private:
+
+ LockHandle( const LockHandle& );
+ LockHandle& operator= ( const LockHandle& );
+
public:
// OS specific Lock Object.
@@ -83,11 +88,7 @@ namespace locks{
public:
- LockHandle() {
-
- lock_count = 0;
- lock_owner_tid = 0;
- lock_owner = NULL;
+ LockHandle() : handle(), lock_owner(NULL), lock_owner_tid(0),
lock_count(0) {
#ifdef HAVE_PTHREAD_H
@@ -127,6 +128,11 @@ namespace locks{
class ConditionObject : public Condition {
private:
+ ConditionObject( const ConditionObject& );
+ ConditionObject& operator= ( const ConditionObject& );
+
+ private:
+
LockHandle* lock;
#ifdef HAVE_PTHREAD_H
@@ -141,9 +147,12 @@ namespace locks{
public:
- ConditionObject( LockHandle* lock ) {
-
- this->lock = lock;
+ ConditionObject( LockHandle* lock ) : lock(lock),
+#ifdef HAVE_PTHREAD_H
+ condition() {
+#else
+ semaphore(), criticalSection(), numWaiting(0), numWake(0),
generation(0) {
+#endif
#ifdef HAVE_PTHREAD_H
if( pthread_cond_init( &condition, NULL ) != 0 ) {
@@ -163,10 +172,6 @@ namespace locks{
throw RuntimeException(
__FILE__, __LINE__, "Failed to initialize OS Condition
object." );
}
-
- this->numWaiting = 0;
- this->numWake = 0;
- this->generation = 0;
#endif
}
@@ -198,8 +203,7 @@ namespace locks{
}}}}
////////////////////////////////////////////////////////////////////////////////
-ReentrantLock::ReentrantLock() {
- this->handle.reset( new LockHandle );
+ReentrantLock::ReentrantLock() : handle(new LockHandle) {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/concurrent/locks/ReentrantLock.h
Sat Dec 18 00:00:48 2010
@@ -82,6 +82,11 @@ namespace locks {
decaf::lang::Pointer<LockHandle> handle;
+ private:
+
+ ReentrantLock( const ReentrantLock& );
+ ReentrantLock& operator= ( const ReentrantLock& );
+
public:
ReentrantLock();
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/Handler.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/Handler.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/Handler.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/Handler.cpp
Sat Dec 18 00:00:48 2010
@@ -31,12 +31,8 @@ using namespace decaf::util::logging;
const Level Handler::DEFAULT_LEVEL = Level::ALL;
////////////////////////////////////////////////////////////////////////////////
-Handler::Handler() : level( DEFAULT_LEVEL ) {
-
- this->errorManager = new ErrorManager();
- this->formatter = NULL;
- this->filter = NULL;
- this->prefix = "Handler";
+Handler::Handler() : formatter(NULL), filter(NULL), errorManager(new
ErrorManager()),
+ level(DEFAULT_LEVEL), prefix("Handler") {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/LogRecord.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/LogRecord.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/LogRecord.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/LogRecord.cpp
Sat Dec 18 00:00:48 2010
@@ -22,7 +22,8 @@ using namespace decaf::util;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
-LogRecord::LogRecord() : level( Level::OFF ){
+LogRecord::LogRecord() : level(Level::OFF), loggerName(), sourceFile(),
sourceLine(), message(),
+ functionName(), timeStamp(0), threadId(0), thrown() {
}
////////////////////////////////////////////////////////////////////////////////
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/StreamHandler.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/StreamHandler.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/StreamHandler.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/logging/StreamHandler.cpp
Sat Dec 18 00:00:48 2010
@@ -33,13 +33,12 @@ using namespace decaf::util;
using namespace decaf::util::logging;
////////////////////////////////////////////////////////////////////////////////
-StreamHandler::StreamHandler() : Handler() {
- this->stream = NULL;
- this->writerNotInitialized = true;
+StreamHandler::StreamHandler() : Handler(), stream(NULL), writer(NULL),
writerNotInitialized(true) {
}
////////////////////////////////////////////////////////////////////////////////
-StreamHandler::StreamHandler( OutputStream* stream, Formatter* formatter ) :
Handler() {
+StreamHandler::StreamHandler( OutputStream* stream, Formatter* formatter ) :
+ Handler(), stream(stream), writer(NULL), writerNotInitialized(true) {
if( stream == NULL ) {
throw NullPointerException(
@@ -51,9 +50,6 @@ StreamHandler::StreamHandler( OutputStre
__FILE__, __LINE__, "Formatter cannot be NULL." );
}
- this->stream = stream;
- this->writerNotInitialized = true;
-
setFormatter( formatter );
}
Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp?rev=1050537&r1=1050536&r2=1050537&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
(original)
+++
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/util/zip/InflaterInputStream.cpp
Sat Dec 18 00:00:48 2010
@@ -33,7 +33,7 @@ const int InflaterInputStream::DEFAULT_B
////////////////////////////////////////////////////////////////////////////////
InflaterInputStream::InflaterInputStream( InputStream* inputStream, bool own )
:
FilterInputStream( inputStream, own ),
- inflater(new Inflater()), buff(), length(0), atEOF(false),
ownInflater(true) {
+ inflater(new Inflater()), buff(), length(0), ownInflater(true),
atEOF(false) {
this->buff.resize( DEFAULT_BUFFER_SIZE );
}
@@ -41,7 +41,7 @@ InflaterInputStream::InflaterInputStream
////////////////////////////////////////////////////////////////////////////////
InflaterInputStream::InflaterInputStream( InputStream* inputStream, Inflater*
inflater, bool own, bool ownInflater )
: FilterInputStream( inputStream, own ),
- inflater(inflater), buff(), length(0), atEOF(false),
ownInflater(ownInflater) {
+ inflater(inflater), buff(), length(0), ownInflater(ownInflater),
atEOF(false) {
if( inflater == NULL ) {
throw NullPointerException(
@@ -55,7 +55,7 @@ InflaterInputStream::InflaterInputStream
InflaterInputStream::InflaterInputStream( InputStream* inputStream, Inflater*
inflater,
int bufferSize, bool own, bool
ownInflater )
: FilterInputStream( inputStream, own ),
- inflater(inflater), buff(), length(0), atEOF(false),
ownInflater(ownInflater) {
+ inflater(inflater), buff(), length(0), ownInflater(ownInflater),
atEOF(false) {
if( inflater == NULL ) {
throw NullPointerException(
