Merge topic 'fix-style'

3c7c332 Fix brace indentation.
c70b9b5 Fix style.
This commit is contained in:
Brad King 2013-05-21 15:13:49 -04:00 committed by CMake Topic Stage
commit 1dbf0aac1b
3 changed files with 4 additions and 4 deletions

View File

@ -82,7 +82,7 @@ public:
{
this->Find(key);
}
}
}
private:
CacheEntry const& GetEntry() const { return this->Position->second; }
CacheEntry& GetEntry() { return this->Position->second; }

View File

@ -2011,13 +2011,13 @@ void cmLocalGenerator::AddCMP0018Flags(std::string &flags, cmTarget* target,
else
{
if (target->GetType() == cmTarget::OBJECT_LIBRARY)
{
{
if (target->GetPropertyAsBool("POSITION_INDEPENDENT_CODE"))
{
this->AddPositionIndependentFlags(flags, lang, targetType);
}
return;
}
}
if (target->GetLinkInterfaceDependentBoolProperty(
"POSITION_INDEPENDENT_CODE",

View File

@ -180,7 +180,7 @@ void deleteAndClear(
//----------------------------------------------------------------------------
cmTargetInternals::~cmTargetInternals()
{
deleteAndClear(CachedLinkInterfaceIncludeDirectoriesEntries);
deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries);
}
//----------------------------------------------------------------------------