diff options
author | Stephen Kelly <steveire@gmail.com> | 2014-01-21 16:07:59 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2014-01-22 14:16:40 (GMT) |
commit | b629240236c1212e550d2040f228344d0327e665 (patch) | |
tree | bcbbbc3ded2584b27a721ec8d36789d317a353fd | |
parent | b33ea5783a6bc1f2adafcdbd2d2907b209a633d9 (diff) | |
download | CMake-b629240236c1212e550d2040f228344d0327e665.zip CMake-b629240236c1212e550d2040f228344d0327e665.tar.gz CMake-b629240236c1212e550d2040f228344d0327e665.tar.bz2 |
cmSourceFileLocation: Use a const cmMakefile.
-rw-r--r-- | Source/cmSourceFileLocation.cxx | 6 | ||||
-rw-r--r-- | Source/cmSourceFileLocation.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmSourceFileLocation.cxx b/Source/cmSourceFileLocation.cxx index 5525b61..5a8578b 100644 --- a/Source/cmSourceFileLocation.cxx +++ b/Source/cmSourceFileLocation.cxx @@ -18,7 +18,7 @@ //---------------------------------------------------------------------------- cmSourceFileLocation -::cmSourceFileLocation(cmMakefile* mf, const char* name): Makefile(mf) +::cmSourceFileLocation(cmMakefile const* mf, const char* name): Makefile(mf) { this->AmbiguousDirectory = !cmSystemTools::FileIsFullPath(name); this->AmbiguousExtension = true; @@ -89,7 +89,7 @@ void cmSourceFileLocation::UpdateExtension(const char* name) // The global generator checks extensions of enabled languages. cmGlobalGenerator* gg = this->Makefile->GetLocalGenerator()->GetGlobalGenerator(); - cmMakefile* mf = this->Makefile; + cmMakefile const* mf = this->Makefile; const std::vector<std::string>& srcExts = mf->GetSourceExtensions(); const std::vector<std::string>& hdrExts = mf->GetHeaderExtensions(); if(gg->GetLanguageFromExtension(ext.c_str()) || @@ -170,7 +170,7 @@ cmSourceFileLocation // Only a fixed set of extensions will be tried to match a file on // disk. One of these must match if loc refers to this source file. std::string ext = this->Name.substr(loc.Name.size()+1); - cmMakefile* mf = this->Makefile; + cmMakefile const* mf = this->Makefile; const std::vector<std::string>& srcExts = mf->GetSourceExtensions(); if(std::find(srcExts.begin(), srcExts.end(), ext) != srcExts.end()) { diff --git a/Source/cmSourceFileLocation.h b/Source/cmSourceFileLocation.h index 216dd07..c03eee7 100644 --- a/Source/cmSourceFileLocation.h +++ b/Source/cmSourceFileLocation.h @@ -33,7 +33,7 @@ public: * Construct for a source file created in a given cmMakefile * instance with an initial name. */ - cmSourceFileLocation(cmMakefile* mf, const char* name); + cmSourceFileLocation(cmMakefile const* mf, const char* name); /** * Return whether the givne source file location could refers to the @@ -81,9 +81,9 @@ public: /** * Get the cmMakefile instance for which the source file was created. */ - cmMakefile* GetMakefile() const { return this->Makefile; } + cmMakefile const* GetMakefile() const { return this->Makefile; } private: - cmMakefile* Makefile; + cmMakefile const* Makefile; bool AmbiguousDirectory; bool AmbiguousExtension; std::string Directory; |