From ea361e91fe39dabab570f85fd747d29104a41b6b Mon Sep 17 00:00:00 2001 From: Brian Cox Date: Fri, 15 Apr 2016 17:16:32 -0700 Subject: [PATCH] Fix warnings around explicitly calling base class constructors in copy constructors --- src/core/fileheader.cpp | 3 ++- src/core/fileheader.h | 2 +- src/fco/fconame.cpp | 9 +++++---- src/fco/fcopropvector.cpp | 4 ++-- src/fco/fcosetimpl.cpp | 4 ++-- src/fco/fcospecimpl.cpp | 2 ++ src/fco/fcospeclist.h | 3 ++- src/fs/fspropset.cpp | 2 ++ src/tw/dbdatasource.cpp | 3 ++- src/tw/headerinfo.h | 0 src/twcrypto/bytequeue.cpp | 5 +++-- 11 files changed, 23 insertions(+), 14 deletions(-) mode change 100644 => 100755 src/core/fileheader.cpp mode change 100644 => 100755 src/core/fileheader.h mode change 100644 => 100755 src/fco/fconame.cpp mode change 100644 => 100755 src/fco/fcopropvector.cpp mode change 100644 => 100755 src/fco/fcosetimpl.cpp mode change 100644 => 100755 src/fco/fcospecimpl.cpp mode change 100644 => 100755 src/fco/fcospeclist.h mode change 100644 => 100755 src/fs/fspropset.cpp mode change 100644 => 100755 src/tw/dbdatasource.cpp mode change 100644 => 100755 src/tw/headerinfo.h mode change 100644 => 100755 src/twcrypto/bytequeue.cpp diff --git a/src/core/fileheader.cpp b/src/core/fileheader.cpp old mode 100644 new mode 100755 index fed64bd..6e971bd --- a/src/core/fileheader.cpp +++ b/src/core/fileheader.cpp @@ -145,7 +145,8 @@ cFileHeader::cFileHeader() } cFileHeader::cFileHeader(const cFileHeader& rhs) -: mID(rhs.mID), +: iSerializable(), + mID(rhs.mID), mVersion(rhs.mVersion), mEncoding(rhs.mEncoding) { diff --git a/src/core/fileheader.h b/src/core/fileheader.h old mode 100644 new mode 100755 index c0404a5..2307815 --- a/src/core/fileheader.h +++ b/src/core/fileheader.h @@ -86,7 +86,7 @@ inline cFileHeaderID::cFileHeaderID(const TCHAR* id) inline cFileHeaderID::cFileHeaderID( const cFileHeaderID& rhs ) : - mIDLen( rhs.mIDLen ) + iSerializable(), mIDLen( rhs.mIDLen ) { memcpy( mID, rhs.mID, MAXBYTES ); } diff --git a/src/fco/fconame.cpp b/src/fco/fconame.cpp old mode 100644 new mode 100755 index 3220c82..fcf36bb --- a/src/fco/fconame.cpp +++ b/src/fco/fconame.cpp @@ -93,7 +93,7 @@ void cFCOName::ClearNameTable() // ctor, dtor /////////////////////////////////////////////////////////////////////////////// cFCOName::cFCOName(iFCONameInfo* pNI) : - mpPathName(0), mDelimiter('/') + iTypedSerializable(), mpPathName(0), mDelimiter('/') { SetNameInfo(pNI); mpPathName = new cFCOName_i; @@ -105,6 +105,7 @@ cFCOName::cFCOName(iFCONameInfo* pNI) : } cFCOName::cFCOName(const cFCOName& rhs) : + iTypedSerializable(), mpPathName(rhs.mpPathName), mDelimiter(rhs.mDelimiter), mbCaseSensitive(rhs.mbCaseSensitive) @@ -117,8 +118,8 @@ cFCOName::cFCOName(const cFCOName& rhs) : #endif } -cFCOName::cFCOName(const TSTRING& rhs, iFCONameInfo* pNI) : - mpPathName(0), mDelimiter('/') +cFCOName::cFCOName(const TSTRING& rhs, iFCONameInfo* pNI) : + iTypedSerializable(), mpPathName(0), mDelimiter('/') { SetNameInfo(pNI); mpPathName = new cFCOName_i; @@ -132,7 +133,7 @@ cFCOName::cFCOName(const TSTRING& rhs, iFCONameInfo* pNI) : } cFCOName::cFCOName(const TCHAR* rhs, iFCONameInfo* pNI) : - mpPathName(0), mDelimiter('/') + iTypedSerializable(), mpPathName(0), mDelimiter('/') { SetNameInfo(pNI); mpPathName = new cFCOName_i; diff --git a/src/fco/fcopropvector.cpp b/src/fco/fcopropvector.cpp old mode 100644 new mode 100755 index 4241c1c..51f656e --- a/src/fco/fcopropvector.cpp +++ b/src/fco/fcopropvector.cpp @@ -45,7 +45,7 @@ int cFCOPropVector::msBitlength(sizeof (uint32) * 8); /////////////////////////////////////////////////////////////////////////////// // Constructor -- Sets mSize. Default = 32. /////////////////////////////////////////////////////////////////////////////// -cFCOPropVector::cFCOPropVector(int size) +cFCOPropVector::cFCOPropVector(int size) : iSerializable() { mSize = 32; mMask = 0; @@ -65,7 +65,7 @@ cFCOPropVector::~cFCOPropVector() /////////////////////////////////////////////////////////////////////////////// // Copy Constructor /////////////////////////////////////////////////////////////////////////////// -cFCOPropVector::cFCOPropVector(const cFCOPropVector &rhs) +cFCOPropVector::cFCOPropVector(const cFCOPropVector &rhs) : iSerializable() { mSize = rhs.mSize; mMask = rhs.mMask; diff --git a/src/fco/fcosetimpl.cpp b/src/fco/fcosetimpl.cpp old mode 100644 new mode 100755 index 50a48dd..06a6c05 --- a/src/fco/fcosetimpl.cpp +++ b/src/fco/fcosetimpl.cpp @@ -63,7 +63,7 @@ inline static const cFCOIterImpl* CreateIterator(const cFCOSetImpl* pSet) /////////////////////////////////////////////////////////////////////////////// // ctor and dtor /////////////////////////////////////////////////////////////////////////////// -cFCOSetImpl::cFCOSetImpl() +cFCOSetImpl::cFCOSetImpl() : iFCOSet() { } @@ -72,7 +72,7 @@ cFCOSetImpl::~cFCOSetImpl() Clear(); } -cFCOSetImpl::cFCOSetImpl(const cFCOSetImpl& rhs) +cFCOSetImpl::cFCOSetImpl(const cFCOSetImpl& rhs) : iFCOSet() { *this = rhs; } diff --git a/src/fco/fcospecimpl.cpp b/src/fco/fcospecimpl.cpp old mode 100644 new mode 100755 index 1a9d8ee..2bc85d2 --- a/src/fco/fcospecimpl.cpp +++ b/src/fco/fcospecimpl.cpp @@ -61,6 +61,7 @@ cFCOSpecImpl::cFCOSpecImpl(const TSTRING& name, void* pSrc, iFCOSpecHelper* pHel } cFCOSpecImpl::cFCOSpecImpl() : + iFCOSpec(), mName(_T("Unnamed_FCOSpecImpl")), mpHelper(0) { @@ -72,6 +73,7 @@ cFCOSpecImpl::cFCOSpecImpl() : } cFCOSpecImpl::cFCOSpecImpl(const cFCOSpecImpl& rhs) : + iFCOSpec(), mpHelper(0) { *this = rhs; diff --git a/src/fco/fcospeclist.h b/src/fco/fcospeclist.h old mode 100644 new mode 100755 index 590a16f..a26fe7f --- a/src/fco/fcospeclist.h +++ b/src/fco/fcospeclist.h @@ -150,7 +150,8 @@ protected: mutable std::list::iterator mIter; }; -inline cFCOSpecList::cFCOSpecList(const cFCOSpecList& rhs) +inline cFCOSpecList::cFCOSpecList(const cFCOSpecList& rhs) + : iTypedSerializable() { *this = rhs; } diff --git a/src/fs/fspropset.cpp b/src/fs/fspropset.cpp old mode 100644 new mode 100755 index 297ce6f..4104706 --- a/src/fs/fspropset.cpp +++ b/src/fs/fspropset.cpp @@ -191,6 +191,7 @@ int cFSPropSet::GetNumFSProps() // ctors. dtor, operator= /////////////////////////////////////////////////////////////////////////////// cFSPropSet::cFSPropSet() : + iFCOPropSet(), mValidProps(cFSPropSet::PROP_NUMITEMS), mUndefinedProps(cFSPropSet::PROP_NUMITEMS) { @@ -203,6 +204,7 @@ cFSPropSet::~cFSPropSet() } cFSPropSet::cFSPropSet(const cFSPropSet& rhs) : + iFCOPropSet(), mValidProps(cFSPropSet::PROP_NUMITEMS) { *this = rhs; diff --git a/src/tw/dbdatasource.cpp b/src/tw/dbdatasource.cpp old mode 100644 new mode 100755 index 753a10a..95eeccb --- a/src/tw/dbdatasource.cpp +++ b/src/tw/dbdatasource.cpp @@ -78,7 +78,8 @@ cDbDataSourceIter::cDbDataSourceIter(cHierDatabase* pDb, int genreNum ) // cDbDataSourceIter /////////////////////////////////////////////////////////////////////////////// cDbDataSourceIter::cDbDataSourceIter( const cDbDataSourceIter& rhs ) -: mDbIter ( rhs.mDbIter ), +: iFCODataSourceIter(), + mDbIter ( rhs.mDbIter ), mFCOCreateFunc ( rhs.mFCOCreateFunc ), mFlags ( rhs.mFlags ), mpErrorBucket ( rhs.mpErrorBucket ) diff --git a/src/tw/headerinfo.h b/src/tw/headerinfo.h old mode 100644 new mode 100755 diff --git a/src/twcrypto/bytequeue.cpp b/src/twcrypto/bytequeue.cpp old mode 100644 new mode 100755 index 0f3213e..eebfe68 --- a/src/twcrypto/bytequeue.cpp +++ b/src/twcrypto/bytequeue.cpp @@ -134,13 +134,14 @@ unsigned int cByteQueueNode::Peek(byte &outByte) const //----------------------------------------------------------------------------- cByteQueue::cByteQueue(int mNodeSize) - : mNodeSize(mNodeSize), + : BufferedTransformation(), + mNodeSize(mNodeSize), mCurrentSize(0) { head = tail = new cByteQueueNode(mNodeSize); } -cByteQueue::cByteQueue(const cByteQueue ©) +cByteQueue::cByteQueue(const cByteQueue ©) : BufferedTransformation() { CopyFrom(copy); }