kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Target copy ctor should copy internal state 

Ideally we should never copy cmTarget instances, but it is a pain to
remove current uses of it.  The pimplized portion of cmTarget has mostly
members that cache results, but some are part of the object state.
These should be copied in the copy ctor instead of re-initialized.
This commit is contained in:
Brad King 2009-10-05 16:14:17 -04:00
parent 08583fc58e
commit 02f85f98c6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmTarget.cxx
View File

@ -55,6 +55,12 @@ public:
{
this->SourceFileFlagsConstructed = false;
}
cmTargetInternals(cmTargetInternals const& r)
{
// Only some of these entries are part of the object state.
// Others not copied here are result caches.
this->SourceEntries = r.SourceEntries;
}
typedef cmTarget::SourceFileFlags SourceFileFlags;
std::map<cmSourceFile const*, SourceFileFlags> SourceFlagsMap;
bool SourceFileFlagsConstructed;
@ -4354,12 +4360,12 @@ cmTargetInternalPointer::cmTargetInternalPointer()
//----------------------------------------------------------------------------
cmTargetInternalPointer
::cmTargetInternalPointer(cmTargetInternalPointer const&)
::cmTargetInternalPointer(cmTargetInternalPointer const& r)
{
// Ideally cmTarget instances should never be copied. However until
// we can make a sweep to remove that, this copy constructor avoids
// allowing the resources (Internals) to be copied.
this->Pointer = new cmTargetInternals;
this->Pointer = new cmTargetInternals(*r.Pointer);
}
//----------------------------------------------------------------------------
@ -4377,7 +4383,7 @@ cmTargetInternalPointer::operator=(cmTargetInternalPointer const& r)
// we can make a sweep to remove that, this copy constructor avoids
// allowing the resources (Internals) to be copied.
cmTargetInternals* oldPointer = this->Pointer;
this->Pointer = new cmTargetInternals;
this->Pointer = new cmTargetInternals(*r.Pointer);
delete oldPointer;
return *this;
}