From bac564356b52b6ef1782615ad704d07bd7b8edd6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 3 May 2005 14:58:13 -0400 Subject: COMP: Added pragma directives for SGI compilers to avoid useless warnings. --- Source/CTest/cmCTestUpdateHandler.h | 8 ++++++++ Source/cmGeneratedFileStream.h | 8 ++++++++ Source/cmLocalUnixMakefileGenerator2.h | 8 ++++++++ Source/cmStandardIncludes.h | 8 ++++++++ Source/cmSystemTools.cxx | 3 +++ Source/kwsys/CommandLineArguments.cxx | 4 ++++ Source/kwsys/SystemTools.cxx | 3 +++ Source/kwsys/testhash.cxx | 4 ++++ 8 files changed, 46 insertions(+) diff --git a/Source/CTest/cmCTestUpdateHandler.h b/Source/CTest/cmCTestUpdateHandler.h index 3f41858..019ee57 100644 --- a/Source/CTest/cmCTestUpdateHandler.h +++ b/Source/CTest/cmCTestUpdateHandler.h @@ -22,6 +22,10 @@ #include "cmCTestGenericHandler.h" #include "cmListFileCache.h" +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif + /** \class cmCTestUpdateHandler * \brief A class that handles ctest -S invocations * @@ -54,4 +58,8 @@ private: int DetermineType(const char* cmd, const char* type); }; +#if defined(__sgi) && !defined(__GNUC__) +# pragma reset woff 1375 /* base class destructor not virtual */ +#endif + #endif diff --git a/Source/cmGeneratedFileStream.h b/Source/cmGeneratedFileStream.h index 90ea51e..6706164 100644 --- a/Source/cmGeneratedFileStream.h +++ b/Source/cmGeneratedFileStream.h @@ -19,6 +19,10 @@ #include "cmStandardIncludes.h" +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif + // This is the first base class of cmGeneratedFileStream. It will be // created before and destroyed after the ofstream portion and can // therefore be used to manage the temporary file. @@ -128,4 +132,8 @@ public: void SetCompression(bool compression); }; +#if defined(__sgi) && !defined(__GNUC__) +# pragma reset woff 1375 /* base class destructor not virtual */ +#endif + #endif diff --git a/Source/cmLocalUnixMakefileGenerator2.h b/Source/cmLocalUnixMakefileGenerator2.h index 65f03b0..61ea950 100644 --- a/Source/cmLocalUnixMakefileGenerator2.h +++ b/Source/cmLocalUnixMakefileGenerator2.h @@ -19,6 +19,10 @@ #include "cmLocalGenerator.h" +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif + class cmCustomCommand; class cmDependInformation; class cmDepends; @@ -278,4 +282,8 @@ private: std::set m_ObjectFiles; }; +#if defined(__sgi) && !defined(__GNUC__) +# pragma reset woff 1375 /* base class destructor not virtual */ +#endif + #endif diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h index f218455..52eff2a 100644 --- a/Source/cmStandardIncludes.h +++ b/Source/cmStandardIncludes.h @@ -181,6 +181,10 @@ inline bool operator==(std::string const& a, const char* b) { return (a==std::string(b)); } # endif // end CM_SGI_CC_720 +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif + // use this class to shrink the size of symbols in .o files // std::string is really basic_string<....lots of stuff....> // when combined with a map or set, the symbols can be > 2000 chars! @@ -306,4 +310,8 @@ public: typedef Superclass::const_iterator const_iterator; }; +#if defined(__sgi) && !defined(__GNUC__) +# pragma reset woff 1375 /* base class destructor not virtual */ +#endif + #endif diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 5f44543..0cde6c8 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -45,6 +45,9 @@ #include +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif bool cmSystemTools::s_RunCommandHideConsole = false; bool cmSystemTools::s_DisableRunCommandOutput = false; diff --git a/Source/kwsys/CommandLineArguments.cxx b/Source/kwsys/CommandLineArguments.cxx index e6185f5..e0d0edc 100644 --- a/Source/kwsys/CommandLineArguments.cxx +++ b/Source/kwsys/CommandLineArguments.cxx @@ -40,6 +40,10 @@ # pragma warning (disable: 4786) #endif +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif + namespace KWSYS_NAMESPACE { diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 7678601..5d4825b 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -33,6 +33,9 @@ # pragma warning (disable: 4786) #endif +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1375 /* base class destructor not virtual */ +#endif #include #include diff --git a/Source/kwsys/testhash.cxx b/Source/kwsys/testhash.cxx index dc3c660..b8cdab1 100644 --- a/Source/kwsys/testhash.cxx +++ b/Source/kwsys/testhash.cxx @@ -29,6 +29,10 @@ # pragma warning (disable:4786) #endif +#if defined(__sgi) && !defined(__GNUC__) +# pragma set woff 1468 /* inline function cannot be explicitly instantiated */ +#endif + template class kwsys::hash_map; template class kwsys::hash_set; -- cgit v0.12