diff options
Diffstat (limited to 'Source/cmNinjaTargetGenerator.h')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 43f2279..e66e55f 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -65,14 +65,14 @@ protected: cmMakefile* GetMakefile() const { return this->Makefile; } - const char* GetConfigName() const; + std::string const& GetConfigName() const; std::string LanguageCompilerRule(const std::string& lang) const { return lang + "_COMPILER"; } - const char* GetFeature(const char* feature); - bool GetFeatureAsBool(const char* feature); - void AddFeatureFlags(std::string& flags, const char* lang); + const char* GetFeature(const std::string& feature); + bool GetFeatureAsBool(const std::string& feature); + void AddFeatureFlags(std::string& flags, const std::string& lang); /** * Compute the flags for compilation of object files for a given @a language. @@ -140,7 +140,7 @@ protected: MacOSXContentGeneratorType* MacOSXContentGenerator; // Properly initialized by sub-classes. cmOSXBundleGenerator* OSXBundleGenerator; - std::set<cmStdString> MacContentFolders; + std::set<std::string> MacContentFolders; void addPoolNinjaVariable(const char* pool_property, cmTarget* target, |