From 190f2c8253910a9e6870948df58a87950e7b4185 Mon Sep 17 00:00:00 2001 From: Alex Neundorf Date: Tue, 25 Sep 2012 19:19:27 +0200 Subject: [PATCH] exports: fix build with MSVC6 it seems it doesn't like deleting const pointers Alex --- Source/cmExportFileGenerator.cxx | 2 +- Source/cmExportInstallFileGenerator.cxx | 4 ++-- Source/cmExportSet.cxx | 2 +- Source/cmExportSet.h | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 36902a12a..dc4fa3181 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -286,7 +286,7 @@ std::vector cmExportFileGenerator::FindNamespaces(cmMakefile* mf, ++expIt) { const cmExportSet* exportSet = expIt->second; - std::vector const* targets = + std::vector const* targets = exportSet->GetTargetExports(); bool containsTarget = false; diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 94b9f46d6..cd05e6086 100644 --- a/Source/cmExportInstallFileGenerator.cxx +++ b/Source/cmExportInstallFileGenerator.cxx @@ -37,7 +37,7 @@ std::string cmExportInstallFileGenerator::GetConfigImportFileGlob() bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) { // Create all the imported targets. - for(std::vector::const_iterator + for(std::vector::const_iterator tei = this->IEGen->GetExportSet()->GetTargetExports()->begin(); tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei) { @@ -163,7 +163,7 @@ cmExportInstallFileGenerator } // Add each target in the set to the export. - for(std::vector::const_iterator + for(std::vector::const_iterator tei = this->IEGen->GetExportSet()->GetTargetExports()->begin(); tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei) { diff --git a/Source/cmExportSet.cxx b/Source/cmExportSet.cxx index 464ad6848..33b063037 100644 --- a/Source/cmExportSet.cxx +++ b/Source/cmExportSet.cxx @@ -21,7 +21,7 @@ cmExportSet::~cmExportSet() } } -void cmExportSet::AddTargetExport(cmTargetExport const* te) +void cmExportSet::AddTargetExport(cmTargetExport* te) { this->TargetExports.push_back(te); } diff --git a/Source/cmExportSet.h b/Source/cmExportSet.h index 91a8bf953..a57aa1204 100644 --- a/Source/cmExportSet.h +++ b/Source/cmExportSet.h @@ -25,20 +25,20 @@ public: /// Destructor ~cmExportSet(); - void AddTargetExport(cmTargetExport const* tgt); + void AddTargetExport(cmTargetExport* tgt); void AddInstallation(cmInstallExportGenerator const* installation); std::string const& GetName() const { return this->Name; } - std::vector const* GetTargetExports() const + std::vector const* GetTargetExports() const { return &this->TargetExports; } std::vector const* GetInstallations() const { return &this->Installations; } private: - std::vector TargetExports; + std::vector TargetExports; std::string Name; std::vector Installations; };