Преглед изворни кода

Remove compile error and remove some warnings

Andy Cedilnik пре 23 година
родитељ
комит
65cc289047

+ 4 - 4
Source/cmGlobalCodeWarriorGenerator.cxx

@@ -41,10 +41,10 @@ void cmGlobalCodeWarriorGenerator::EnableLanguage(const char*,
 }
 
 int cmGlobalCodeWarriorGenerator::TryCompile(const char *, 
-                                             const char */*bindir*/, 
-                                             const char */*projectName*/,
-                                             const char */*targetName*/,
-                                             std::string */*output*/)
+                                             const char* /*bindir*/, 
+                                             const char* /*projectName*/,
+                                             const char* /*targetName*/,
+                                             std::string* /*output*/)
 {
   return 1;
 }

+ 2 - 2
Source/cmLocalCodeWarriorGenerator.cxx

@@ -258,7 +258,7 @@ void cmLocalCodeWarriorGenerator::WriteSettingList(std::ostream& fout,
 }
 
 void cmLocalCodeWarriorGenerator::WriteFileList(std::ostream& fout,
-                                                const char */*tgtName*/,
+                                                const char* /*tgtName*/,
                                                 cmTarget const *l)
 {
   fout << "<FILELIST>\n";
@@ -301,7 +301,7 @@ void cmLocalCodeWarriorGenerator::WriteFileList(std::ostream& fout,
 
 
 void cmLocalCodeWarriorGenerator::WriteLinkOrder(std::ostream& fout,
-                                                 const char */*tgtName*/,
+                                                 const char* /*tgtName*/,
                                                  cmTarget const *l)
 {
   fout << "<LINKORDER>\n";

+ 2 - 1
Source/cmStandardIncludes.h

@@ -176,8 +176,9 @@ private:
 class cmInputStringStream: public std::istringstream
 {
 public:
+  typedef std::istringstream Superclass;
   cmInputStringStream() {}
-  cmInputStringStream(const char* c) : std::istringstream(c) {}
+  cmInputStringStream(const char* c) : Superclass(c) {}
 private:
   cmInputStringStream(const cmInputStringStream&);
   void operator=(const cmInputStringStream&);