From 45e9d19c6c456024f6cef663e29447bfae148fff Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 1 May 2001 17:35:23 -0400 Subject: [PATCH] ENH: Changed WriteConfiguration back to const because it doesn't need to report errors anymore. --- Source/cmCableInstantiateClassCommand.cxx | 4 +--- Source/cmCableInstantiateClassCommand.h | 2 +- Source/cmCableInstantiateCommand.cxx | 4 +--- Source/cmCableInstantiateCommand.h | 2 +- Source/cmCablePackageEntryCommand.cxx | 4 +++- Source/cmCablePackageEntryCommand.h | 2 +- Source/cmCableSourceFilesCommand.cxx | 4 +--- Source/cmCableSourceFilesCommand.h | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/Source/cmCableInstantiateClassCommand.cxx b/Source/cmCableInstantiateClassCommand.cxx index 179ea8e9f..f6db806fd 100644 --- a/Source/cmCableInstantiateClassCommand.cxx +++ b/Source/cmCableInstantiateClassCommand.cxx @@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * Write the CABLE configuration code to define this InstantiationSet. * This includes the "class" keyword to do class template instantiations. */ -bool cmCableInstantiateClassCommand::WriteConfiguration() +void cmCableInstantiateClassCommand::WriteConfiguration() const { std::ostream& os = m_CableData->GetOutputStream(); cmCableData::Indentation indent = m_CableData->GetIndentation(); @@ -71,6 +71,4 @@ bool cmCableInstantiateClassCommand::WriteConfiguration() os << "" << std::endl; } os << indent << "" << std::endl; - - return true; } diff --git a/Source/cmCableInstantiateClassCommand.h b/Source/cmCableInstantiateClassCommand.h index 173acb11c..1d54e6ac2 100644 --- a/Source/cmCableInstantiateClassCommand.h +++ b/Source/cmCableInstantiateClassCommand.h @@ -88,7 +88,7 @@ public: "template classes (not functions, operators, etc)."; } - virtual bool WriteConfiguration(); + virtual void WriteConfiguration() const; cmTypeMacro(cmCableInstantiateClassCommand, cmCableInstantiateCommand); protected: diff --git a/Source/cmCableInstantiateCommand.cxx b/Source/cmCableInstantiateCommand.cxx index a0dd8984f..ddf7903fe 100644 --- a/Source/cmCableInstantiateCommand.cxx +++ b/Source/cmCableInstantiateCommand.cxx @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /** * Write the CABLE configuration code to define this InstantiationSet. */ -bool cmCableInstantiateCommand::WriteConfiguration() +void cmCableInstantiateCommand::WriteConfiguration() const { std::ostream& os = m_CableData->GetOutputStream(); cmCableData::Indentation indent = m_CableData->GetIndentation(); @@ -70,6 +70,4 @@ bool cmCableInstantiateCommand::WriteConfiguration() os << "" << std::endl; } os << indent << "" << std::endl; - - return true; } diff --git a/Source/cmCableInstantiateCommand.h b/Source/cmCableInstantiateCommand.h index b319b5e33..eb173ebb6 100644 --- a/Source/cmCableInstantiateCommand.h +++ b/Source/cmCableInstantiateCommand.h @@ -87,7 +87,7 @@ public: "template non-classes (functions, operators, etc)."; } - virtual bool WriteConfiguration(); + virtual void WriteConfiguration() const; cmTypeMacro(cmCableInstantiateCommand, cmCablePackageCommand); protected: diff --git a/Source/cmCablePackageEntryCommand.cxx b/Source/cmCablePackageEntryCommand.cxx index 771966ad3..c8873bb1b 100644 --- a/Source/cmCablePackageEntryCommand.cxx +++ b/Source/cmCablePackageEntryCommand.cxx @@ -61,5 +61,7 @@ bool cmCablePackageEntryCommand::Invoke(std::vector& args) } // Write this command's configuration. - return this->WriteConfiguration(); + this->WriteConfiguration(); + + return true; } diff --git a/Source/cmCablePackageEntryCommand.h b/Source/cmCablePackageEntryCommand.h index 38bc9d540..37593471f 100644 --- a/Source/cmCablePackageEntryCommand.h +++ b/Source/cmCablePackageEntryCommand.h @@ -67,7 +67,7 @@ public: cmTypeMacro(cmCablePackageEntryCommand, cmCableCommand); - virtual bool WriteConfiguration() =0; + virtual void WriteConfiguration() const =0; protected: typedef std::vector Entries; diff --git a/Source/cmCableSourceFilesCommand.cxx b/Source/cmCableSourceFilesCommand.cxx index 4daff3c91..c4024f8eb 100644 --- a/Source/cmCableSourceFilesCommand.cxx +++ b/Source/cmCableSourceFilesCommand.cxx @@ -70,7 +70,7 @@ void cmCableSourceFilesCommand::FinalPass() * Write the CABLE configuration code to indicate header dependencies for * a package. */ -bool cmCableSourceFilesCommand::WriteConfiguration() +void cmCableSourceFilesCommand::WriteConfiguration() const { std::ostream& os = m_CableData->GetOutputStream(); cmCableData::Indentation indent = m_CableData->GetIndentation(); @@ -102,8 +102,6 @@ bool cmCableSourceFilesCommand::WriteConfiguration() } } os << indent << "" << std::endl; - - return true; } diff --git a/Source/cmCableSourceFilesCommand.h b/Source/cmCableSourceFilesCommand.h index 5c7cdce83..f5d77deae 100644 --- a/Source/cmCableSourceFilesCommand.h +++ b/Source/cmCableSourceFilesCommand.h @@ -92,7 +92,7 @@ public: "Generates a Package's Headers block in the CABLE configuration."; } - virtual bool WriteConfiguration(); + virtual void WriteConfiguration() const; bool SourceFileExists(const std::string&) const; cmTypeMacro(cmCableSourceFilesCommand, cmCableCommand);