From c70b9b51d9c711d761bc45c0918bc8bc75b23d19 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 2 May 2013 16:46:57 +0200 Subject: [PATCH 1/2] Fix style. --- Source/cmCacheManager.h | 2 +- Source/cmTarget.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h index 4a5ee450f..a5e5eeeff 100644 --- a/Source/cmCacheManager.h +++ b/Source/cmCacheManager.h @@ -82,7 +82,7 @@ public: { this->Find(key); } - } + } private: CacheEntry const& GetEntry() const { return this->Position->second; } CacheEntry& GetEntry() { return this->Position->second; } diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index d14bfcaf6..f6dd1c28c 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -180,7 +180,7 @@ void deleteAndClear( //---------------------------------------------------------------------------- cmTargetInternals::~cmTargetInternals() { - deleteAndClear(CachedLinkInterfaceIncludeDirectoriesEntries); + deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries); } //---------------------------------------------------------------------------- From 3c7c33292966a5bb35c6ff5a16aa10ccf643838a Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 18 May 2013 09:54:50 +0200 Subject: [PATCH 2/2] Fix brace indentation. --- Source/cmLocalGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index ee5b9d812..fc3ad4ec7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -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",