From d89adbf04980c26a101dd5134224215451bd6455 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 26 Nov 2003 16:12:52 -0500 Subject: remove warnings --- Source/cmGlobalVisualStudio6Generator.cxx | 5 ++--- Source/cmGlobalVisualStudio6Generator.h | 2 +- Source/cmGlobalVisualStudio7Generator.cxx | 5 ++--- Source/cmGlobalVisualStudio7Generator.h | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Source/cmGlobalVisualStudio6Generator.cxx b/Source/cmGlobalVisualStudio6Generator.cxx index 171a93b..a42d4b0 100644 --- a/Source/cmGlobalVisualStudio6Generator.cxx +++ b/Source/cmGlobalVisualStudio6Generator.cxx @@ -325,8 +325,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout, this->WriteDSWFooter(fout); } -void cmGlobalVisualStudio6Generator::OutputDSWFile(const char* projectName, - std::vector& generators) +void cmGlobalVisualStudio6Generator::OutputDSWFile(std::vector& generators) { if(generators.size() == 0) { @@ -353,7 +352,7 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile() for(it = m_SubProjectMap.begin(); it!= m_SubProjectMap.end(); ++it) { std::vector& gen = it->second; - this->OutputDSWFile(it->first.c_str(), it->second); + this->OutputDSWFile(it->second); } } diff --git a/Source/cmGlobalVisualStudio6Generator.h b/Source/cmGlobalVisualStudio6Generator.h index ff0d8a3..0bf0cc2 100644 --- a/Source/cmGlobalVisualStudio6Generator.h +++ b/Source/cmGlobalVisualStudio6Generator.h @@ -68,7 +68,7 @@ public: * Generate the DSW workspace file. */ virtual void OutputDSWFile(); - virtual void OutputDSWFile(const char* projectName, std::vector& generators); + virtual void OutputDSWFile(std::vector& generators); virtual void WriteDSWFile(std::ostream& fout, std::vector& generators); private: diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx index 81d4219..42fa6dc 100644 --- a/Source/cmGlobalVisualStudio7Generator.cxx +++ b/Source/cmGlobalVisualStudio7Generator.cxx @@ -269,8 +269,7 @@ void cmGlobalVisualStudio7Generator::Generate() this->OutputSLNFile(); } -void cmGlobalVisualStudio7Generator::OutputSLNFile(const char* projectName, - std::vector& generators) +void cmGlobalVisualStudio7Generator::OutputSLNFile(std::vector& generators) { if(generators.size() == 0) { @@ -297,7 +296,7 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile() for(it = m_SubProjectMap.begin(); it!= m_SubProjectMap.end(); ++it) { std::vector& gen = it->second; - this->OutputSLNFile(it->first.c_str(), it->second); + this->OutputSLNFile(it->second); } } diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index a8e2fb1..4cd5bc2 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -83,8 +83,7 @@ public: protected: void CollectSubprojects(); - void OutputSLNFile(const char* projectName, - std::vector& generators); + virtual void OutputSLNFile(std::vector& generators); virtual void WriteSLNFile(std::ostream& fout, std::vector& generators); virtual void WriteProject(std::ostream& fout, const char* name, const char* path, -- cgit v0.12