Browse Source

remove warnings

Bill Hoffman 22 years ago
parent
commit
d89adbf049

+ 2 - 3
Source/cmGlobalVisualStudio6Generator.cxx

@@ -325,8 +325,7 @@ void cmGlobalVisualStudio6Generator::WriteDSWFile(std::ostream& fout,
   this->WriteDSWFooter(fout);
 }
 
-void cmGlobalVisualStudio6Generator::OutputDSWFile(const char* projectName,
-                                                   std::vector<cmLocalGenerator*>& generators)
+void cmGlobalVisualStudio6Generator::OutputDSWFile(std::vector<cmLocalGenerator*>& generators)
 {
   if(generators.size() == 0)
     {
@@ -353,7 +352,7 @@ void cmGlobalVisualStudio6Generator::OutputDSWFile()
   for(it = m_SubProjectMap.begin(); it!= m_SubProjectMap.end(); ++it)
     {
     std::vector<cmLocalGenerator*>& gen = it->second;
-    this->OutputDSWFile(it->first.c_str(), it->second);
+    this->OutputDSWFile(it->second);
     }
 }
 

+ 1 - 1
Source/cmGlobalVisualStudio6Generator.h

@@ -68,7 +68,7 @@ public:
    * Generate the DSW workspace file.
    */
   virtual void OutputDSWFile();
-  virtual void OutputDSWFile(const char* projectName, std::vector<cmLocalGenerator*>& generators);
+  virtual void OutputDSWFile(std::vector<cmLocalGenerator*>& generators);
   virtual void WriteDSWFile(std::ostream& fout,
                             std::vector<cmLocalGenerator*>& generators);
 private:

+ 2 - 3
Source/cmGlobalVisualStudio7Generator.cxx

@@ -269,8 +269,7 @@ void cmGlobalVisualStudio7Generator::Generate()
   this->OutputSLNFile();
 }
 
-void cmGlobalVisualStudio7Generator::OutputSLNFile(const char* projectName,
-                                                   std::vector<cmLocalGenerator*>& generators)
+void cmGlobalVisualStudio7Generator::OutputSLNFile(std::vector<cmLocalGenerator*>& generators)
 {
   if(generators.size() == 0)
     {
@@ -297,7 +296,7 @@ void cmGlobalVisualStudio7Generator::OutputSLNFile()
   for(it = m_SubProjectMap.begin(); it!= m_SubProjectMap.end(); ++it)
     {
     std::vector<cmLocalGenerator*>& gen = it->second;
-    this->OutputSLNFile(it->first.c_str(), it->second);
+    this->OutputSLNFile(it->second);
     }
 }
 

+ 1 - 2
Source/cmGlobalVisualStudio7Generator.h

@@ -83,8 +83,7 @@ public:
       
 protected:
   void CollectSubprojects();
-  void OutputSLNFile(const char* projectName,
-                     std::vector<cmLocalGenerator*>& generators);
+  virtual void OutputSLNFile(std::vector<cmLocalGenerator*>& generators);
   virtual void WriteSLNFile(std::ostream& fout, std::vector<cmLocalGenerator*>& generators);
   virtual void WriteProject(std::ostream& fout, 
                             const char* name, const char* path,