Browse Source

exports: fix build with MSVC6

it seems it doesn't like deleting const pointers

Alex
Alex Neundorf 13 years ago
parent
commit
190f2c8253

+ 1 - 1
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;

+ 2 - 2
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)
     {

+ 1 - 1
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);
 }

+ 3 - 3
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;
 };