From 40a4302414e7dc51525f0b14159f0bebb45c9614 Mon Sep 17 00:00:00 2001 From: Patrick Gansterer Date: Sun, 4 Aug 2013 18:22:22 +0200 Subject: [PATCH] VS12: Remove duplicated overload of UseFolderProperty() cmGlobalVisualStudio11Generator generator already defines the same function body, which makes the additional overload useless. --- Source/cmGlobalVisualStudio12Generator.cxx | 9 --------- Source/cmGlobalVisualStudio12Generator.h | 1 - 2 files changed, 10 deletions(-) diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx index 6669f94f4..3b1eb12c5 100644 --- a/Source/cmGlobalVisualStudio12Generator.cxx +++ b/Source/cmGlobalVisualStudio12Generator.cxx @@ -100,12 +100,3 @@ cmLocalGenerator *cmGlobalVisualStudio12Generator::CreateLocalGenerator() lg->SetGlobalGenerator(this); return lg; } - -//---------------------------------------------------------------------------- -bool cmGlobalVisualStudio12Generator::UseFolderProperty() -{ - // Intentionally skip over the parent class implementation and call the - // grand-parent class's implementation. Folders are not supported by the - // Express editions in VS10 and earlier, but they are in VS12 Express. - return cmGlobalVisualStudio8Generator::UseFolderProperty(); -} diff --git a/Source/cmGlobalVisualStudio12Generator.h b/Source/cmGlobalVisualStudio12Generator.h index 2a2133be6..064e310d0 100644 --- a/Source/cmGlobalVisualStudio12Generator.h +++ b/Source/cmGlobalVisualStudio12Generator.h @@ -33,7 +33,6 @@ public: virtual std::string GetUserMacrosDirectory() { return ""; } protected: virtual const char* GetIDEVersion() { return "12.0"; } - bool UseFolderProperty(); private: class Factory; };