Updated some files to fix an extra destructor that was being called.

ctb · Jul 7, 2010 · fa90496 · fa90496
1 parent 4868ff7
commit fa90496
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/Caper/Caper.vcxproj b/Caper/Caper.vcxproj
@@ -84,6 +84,7 @@
     <ClInclude Include="FASequenceEngine.h" />
     <ClInclude Include="FASequenceIndexer.h" />
     <ClInclude Include="IndexAndOffset.h" />
+    <ClInclude Include="IndexedMappings.h" />
     <ClInclude Include="Line.h" />
     <ClInclude Include="Mapping.h" />
     <ClInclude Include="MappingCache.h" />

diff --git a/Caper/MappingCache.h b/Caper/MappingCache.h
@@ -152,7 +152,8 @@ class MappingCache
 
   ~MappingCache()
   {
-    DestroyMappings();
+   // DestroyMappings();
+    cout << "~~MappingCache - Destructor" << endl;
   }
 
 private:

diff --git a/Caper/ReadsAtIndex.h b/Caper/ReadsAtIndex.h
@@ -32,6 +32,10 @@ class ReadsAtIndex :
         cout << "~~ReadsAtIndex - Destroy - Decrementing:" << ReferenceCount << " to " << ReferenceCount -1 << endl;
        --ReferenceCount; // just decrement us, but don't delete the pointer itself. That would suck for other people who have to use the pointer.
      }
+     else
+     {
+       cout << "~~ReadsAtIndex - Destroy - Wut?" << endl;
+     }
      cout << "~~ReadsAtIndex - Destroy - Done" << endl;
   }
 

diff --git a/CaperVS/CaperVS.sln b/CaperVS/CaperVS.sln
@@ -12,6 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Caper", "..\Caper\Caper.vcx
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "..\zlib123\contrib\vstudio\vc8\zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NewFolder1", "NewFolder1", "{B25EAE32-DE0A-4BBC-8CD3-C2A393C93B55}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,4 +106,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{B25EAE32-DE0A-4BBC-8CD3-C2A393C93B55} = {8810A69C-004C-44F5-B950-781517BCD085}
+	EndGlobalSection
 EndGlobal