From 65cc289047fc2a4b444838c690d9bd45eca04f7e Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Thu, 10 Oct 2002 09:41:58 -0400 Subject: Remove compile error and remove some warnings --- Source/cmGlobalCodeWarriorGenerator.cxx | 8 ++++---- Source/cmLocalCodeWarriorGenerator.cxx | 4 ++-- Source/cmStandardIncludes.h | 3 ++- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Source/cmGlobalCodeWarriorGenerator.cxx b/Source/cmGlobalCodeWarriorGenerator.cxx index 014f00c..41dbaa6 100644 --- a/Source/cmGlobalCodeWarriorGenerator.cxx +++ b/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; } diff --git a/Source/cmLocalCodeWarriorGenerator.cxx b/Source/cmLocalCodeWarriorGenerator.cxx index 0a36e99..074aae9 100644 --- a/Source/cmLocalCodeWarriorGenerator.cxx +++ b/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 << "\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 << "\n"; diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index 22bb4bf..20c4b0e 100644 --- a/Source/cmStandardIncludes.h +++ b/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&); -- cgit v0.12