diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-25 17:19:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-28 21:00:52 (GMT) |
| commit | 190f2c8253910a9e6870948df58a87950e7b4185 (patch) | |
| tree | e38e387c287ae55aee25945f5349b911c85d81ef | |
| parent | 8b5f448ba628dc474d3cd22d67db65551acc0846 (diff) | |
| download | CMake-190f2c8253910a9e6870948df58a87950e7b4185.zip CMake-190f2c8253910a9e6870948df58a87950e7b4185.tar.gz CMake-190f2c8253910a9e6870948df58a87950e7b4185.tar.bz2 | |
exports: fix build with MSVC6
it seems it doesn't like deleting const pointers
Alex
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmExportInstallFileGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmExportSet.cxx | 2 | ||||
| -rw-r--r-- | Source/cmExportSet.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index 36902a1..dc4fa31 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -286,7 +286,7 @@ std::vector<std::string> cmExportFileGenerator::FindNamespaces(cmMakefile* mf, ++expIt) { const cmExportSet* exportSet = expIt->second; - std::vector<cmTargetExport const*> const* targets = + std::vector<cmTargetExport*> const* targets = exportSet->GetTargetExports(); bool containsTarget = false; diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx index 94b9f46..cd05e60 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<cmTargetExport const*>::const_iterator + for(std::vector<cmTargetExport*>::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<cmTargetExport const*>::const_iterator + for(std::vector<cmTargetExport*>::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 464ad68..33b0630 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 91a8bf9..a57aa12 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<cmTargetExport const*> const* GetTargetExports() const + std::vector<cmTargetExport*> const* GetTargetExports() const { return &this->TargetExports; } std::vector<cmInstallExportGenerator const*> const* GetInstallations() const { return &this->Installations; } private: - std::vector<cmTargetExport const*> TargetExports; + std::vector<cmTargetExport*> TargetExports; std::string Name; std::vector<cmInstallExportGenerator const*> Installations; }; |