[Mobies-commit] [commit] r4213 - in UDM/trunk: Projects/Win32/VC9/tests/test_crosslinks src/UdmDom
endre at redhat3.isis.vanderbilt.edu
endre at redhat3.isis.vanderbilt.edu
Sun Dec 8 11:43:09 CST 2013
Author: endre
Date: Sun Dec 8 11:43:09 2013
New Revision: 4213
Log:
delete called on 'Udm::ObjectImpl'that is abstract but has non-virtual destructor [-Wdelete-non-virtual-dtor]
Modified:
UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj
UDM/trunk/src/UdmDom/UdmDom.cpp
Modified: UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj
==============================================================================
--- UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj Sun Dec 8 04:50:17 2013 (r4212)
+++ UDM/trunk/Projects/Win32/VC9/tests/test_crosslinks/Test_CrossLinks.vcproj Sun Dec 8 11:43:09 2013 (r4213)
@@ -241,29 +241,6 @@
/>
</FileConfiguration>
</File>
- <File
- RelativePath="..\..\..\..\..\tests\test_crosslinks\test_CrossLinks.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
- />
- </FileConfiguration>
- </File>
</Filter>
<Filter
Name="Header Files"
@@ -278,53 +255,53 @@
Name="Generated Files"
>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.cpp"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.cpp"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.h"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -333,10 +310,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL.h"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -345,89 +322,89 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL_udm.udm"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL_udm.udm"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ Description="Generating UDM API files from $(InputPath)"
+ CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_crosslinks" "$(InputPath)" -d "%UDM_PATH%\etc"
"
+ Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd; $(OutDir)\Gen\tests\test_crosslinks\CL.cpp; $(OutDir)\Gen\tests\test_crosslinks\CL.h; $(OutDir)\Gen\tests\test_crosslinks\CL.xsd; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.cpp; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.h; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp_NSc.xsd"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating UDM API files from $(InputPath)"
- CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_crosslinks" "$(InputPath)" -d "%UDM_PATH%\etc"
"
- Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CL_udm.udm"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CL_udm.udm"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
- Description="Generating UDM API files from $(InputPath)"
- CommandLine=""$(OutDir)\UdmD.exe" -o "$(OutDir)\Gen\tests\test_crosslinks" "$(InputPath)" -d "%UDM_PATH%\etc"
"
- Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd; $(OutDir)\Gen\tests\test_crosslinks\CL.cpp; $(OutDir)\Gen\tests\test_crosslinks\CL.h; $(OutDir)\Gen\tests\test_crosslinks\CL.xsd; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.cpp; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.h; $(OutDir)\Gen\tests\test_crosslinks\CLPackage.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2_NSp_NSc.xsd"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCustomBuildTool"
+ Description="Generating UDM API files from $(InputPath)"
+ CommandLine=""$(OutDir)\Udm.exe" -o "$(OutDir)\Gen\tests\test_crosslinks" "$(InputPath)" -d "%UDM_PATH%\etc"
"
+ Outputs="$(OutDir)\Gen\tests\test_crosslinks\Package1.h; $(OutDir)\Gen\tests\test_crosslinks\Package1.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package1.xsd; $(OutDir)\Gen\tests\test_crosslinks\Package2.h; $(OutDir)\Gen\tests\test_crosslinks\Package2.cpp; $(OutDir)\Gen\tests\test_crosslinks\Package2.xsd"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CLPackage.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CLPackage.cpp"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\CLPackage.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\CLPackage.cpp"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
@@ -456,53 +433,53 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.cpp"
>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
- PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.cpp"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.cpp"
>
<FileConfiguration
Name="Debug|Win32"
+ ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
- PreprocessorDefinitions=""
- BasicRuntimeChecks="3"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.h"
>
<FileConfiguration
- Name="Debug|Win32"
+ Name="Release|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -511,10 +488,10 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package1.h"
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package1.h"
>
<FileConfiguration
- Name="Release|Win32"
+ Name="Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
@@ -566,6 +543,18 @@
</FileConfiguration>
</File>
<File
+ RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ ExcludedFromBuild="true"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\..\..\Build\Win32\VC9\Release\Gen\tests\test_crosslinks\Package2.h"
>
<FileConfiguration
@@ -578,14 +567,25 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\..\Build\Win32\VC9\Debug\Gen\tests\test_crosslinks\Package2.h"
+ RelativePath="..\..\..\..\..\tests\test_crosslinks\test_CrossLinks.cpp"
>
<FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ PreprocessorDefinitions=""
+ BasicRuntimeChecks="3"
+ />
+ </FileConfiguration>
+ <FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
- Name="VCCustomBuildTool"
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
Modified: UDM/trunk/src/UdmDom/UdmDom.cpp
==============================================================================
--- UDM/trunk/src/UdmDom/UdmDom.cpp Sun Dec 8 04:50:17 2013 (r4212)
+++ UDM/trunk/src/UdmDom/UdmDom.cpp Sun Dec 8 11:43:09 2013 (r4213)
@@ -2881,7 +2881,7 @@
while (instances_i != instances.end())
{
(*instances_i)->setAssociation(role, nvect,mode, false);
- delete *instances_i;
+ delete (DomObject*)*instances_i;
instances_i++;
}
@@ -2891,7 +2891,7 @@
while (deriveds_i != deriveds.end())
{
(*deriveds_i )->setAssociation(role, nvect,mode, false);
- delete *deriveds_i ;
+ delete (DomObject*)*deriveds_i ;
deriveds_i ++;
}
More information about the Mobies-commit
mailing list