Revision: 65251
http://sourceforge.net/p/brlcad/code/65251
Author: brlcad
Date: 2015-06-10 18:52:54 +0000 (Wed, 10 Jun 2015)
Log Message:
-----------
Quell the remainder of the STEP compilation warnings where there was an
inconsistent type definition on the Load() function. The base class specifies
a SDAI_Application_instance (which is also the dominant use), but a handful of
class entity types like SDAI_Select and a few other more specific types. This
change makes them all specify an app instance pointer with casts back to their
expected type accordingly (which is what the compiler was doing anyways, hence
the warnings). Ideally, they should actually be using an app instance or the
base class should be using a different common type.
Modified Paths:
--------------
brlcad/trunk/src/conv/step/step-g/Axis2Placement.cpp
brlcad/trunk/src/conv/step/step-g/Axis2Placement.h
brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.cpp
brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.h
brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.cpp
brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.h
brlcad/trunk/src/conv/step/step-g/Conic.cpp
brlcad/trunk/src/conv/step/step-g/GeometricSet.cpp
brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.cpp
brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.h
brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.cpp
brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.h
brlcad/trunk/src/conv/step/step-g/PropertyDefinition.cpp
brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.cpp
brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.h
brlcad/trunk/src/conv/step/step-g/ShapeDefinition.cpp
brlcad/trunk/src/conv/step/step-g/ShapeDefinition.h
brlcad/trunk/src/conv/step/step-g/SurfaceCurve.cpp
brlcad/trunk/src/conv/step/step-g/TrimmedCurve.cpp
brlcad/trunk/src/conv/step/step-g/TrimmingSelect.cpp
brlcad/trunk/src/conv/step/step-g/TrimmingSelect.h
Modified: brlcad/trunk/src/conv/step/step-g/Axis2Placement.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/Axis2Placement.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/Axis2Placement.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -88,7 +88,7 @@
}
bool
-Axis2Placement::Load(STEPWrapper *sw, SDAI_Select *sse)
+Axis2Placement::Load(STEPWrapper *sw, SDAI_Application_instance *sse)
{
step = sw;
Modified: brlcad/trunk/src/conv/step/step-g/Axis2Placement.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/Axis2Placement.h 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/Axis2Placement.h 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -56,7 +56,7 @@
const double *GetNormal();
const double *GetXAxis();
const double *GetYAxis();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual void Print(int level);
//static methods
Modified: brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.cpp
2015-06-10 18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.cpp
2015-06-10 18:52:54 UTC (rev 65251)
@@ -129,7 +129,7 @@
}
bool
-CharacterizedDefinition::Load(STEPWrapper *sw,SDAI_Select *sse) {
+CharacterizedDefinition::Load(STEPWrapper *sw,SDAI_Application_instance *sse) {
step=sw;
if (definition == NULL) {
@@ -141,7 +141,7 @@
type = CharacterizedDefinition::CHARACTERIZED_PRODUCT_DEFINITION;
definition = aCPD;
- if (!aCPD->Load(step, cpd_select)) {
+ if (!aCPD->Load(step, (SDAI_Application_instance *)cpd_select)) {
std::cout << CLASSNAME << ":Error loading select attribute
'definition' as CharacterizedProductDefinition from CharacterizedDefinition."
<< std::endl;
return false;
}
@@ -151,7 +151,7 @@
type = CharacterizedDefinition::SHAPE_DEFINITION;
definition = aSD;
- if (!aSD->Load(step, sd_select)) {
+ if (!aSD->Load(step, (SDAI_Application_instance *)sd_select)) {
std::cout << CLASSNAME << ":Error loading select attribute
'definition' as CharacterizedProductDefinition from CharacterizedDefinition."
<< std::endl;
return false;
}
Modified: brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.h 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/CharacterizedDefinition.h 2015-06-10
18:52:54 UTC (rev 65251)
@@ -65,7 +65,7 @@
int GetProductId();
ProductDefinition *GetRelatingProductDefinition();
ProductDefinition *GetRelatedProductDefinition();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual bool LoadONBrep(ON_Brep *brep);
virtual void Print(int level);
virtual CharacterizedDefinition_type CharacterizedDefinitionType()
Modified: brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.cpp
2015-06-10 18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.cpp
2015-06-10 18:52:54 UTC (rev 65251)
@@ -120,7 +120,7 @@
}
bool
-CharacterizedProductDefinition::Load(STEPWrapper *sw,SDAI_Select *sse) {
+CharacterizedProductDefinition::Load(STEPWrapper *sw,
SDAI_Application_instance *sse) {
step=sw;
if (definition == NULL) {
Modified: brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.h
2015-06-10 18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/CharacterizedProductDefinition.h
2015-06-10 18:52:54 UTC (rev 65251)
@@ -63,7 +63,7 @@
int GetProductId();
ProductDefinition *GetRelatingProductDefinition();
ProductDefinition *GetRelatedProductDefinition();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual bool LoadONBrep(ON_Brep *brep);
virtual void Print(int level);
virtual CharacterizedProductDefinition_type
CharacterizedProductDefinitionType()
Modified: brlcad/trunk/src/conv/step/step-g/Conic.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/Conic.cpp 2015-06-10 18:38:50 UTC (rev
65250)
+++ brlcad/trunk/src/conv/step/step-g/Conic.cpp 2015-06-10 18:52:54 UTC (rev
65251)
@@ -102,7 +102,7 @@
Axis2Placement *aA2P = new Axis2Placement();
position = aA2P;
- if (!aA2P->Load(step, select)) {
+ if (!aA2P->Load(step, (SDAI_Application_instance *)select)) {
std::cout << CLASSNAME << ":Error loading select Axis2Placement
from Conic." << std::endl;
sw->entity_status[id] = STEP_LOAD_ERROR;
return false;
Modified: brlcad/trunk/src/conv/step/step-g/GeometricSet.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/GeometricSet.cpp 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/GeometricSet.cpp 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -78,7 +78,7 @@
if (aGSS) {
elements.push_back(aGSS);
- if (!aGSS->Load(step, select)) {
+ if (!aGSS->Load(step, (SDAI_Application_instance *)select))
{
std::cout << CLASSNAME << ":Error loading select
attribute list 'elements' as GeometricSetSelect from GeometricSet." <<
std::endl;
return false;
}
Modified: brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -70,11 +70,11 @@
}
bool
-GeometricSetSelect::Load(STEPWrapper *sw,SDAI_Select *sse) {
+GeometricSetSelect::Load(STEPWrapper *sw, SDAI_Application_instance *sse) {
step=sw;
if (element == NULL) {
- SdaiGeometric_set_select *v = (SdaiGeometric_set_select *) sse;
+ SdaiGeometric_set_select *v = (SdaiGeometric_set_select *)sse;
if (v->IsPoint()) {
SdaiPoint *point_select = *v;
Modified: brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.h 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/GeometricSetSelect.h 2015-06-10
18:52:54 UTC (rev 65251)
@@ -60,7 +60,7 @@
Point *GetPointElement();
Curve *GetCurveElement();
Surface *GetSurfaceElement();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual bool LoadONBrep(ON_Brep *brep);
virtual void Print(int level);
virtual GeometricSetSelect_type GeometricSetSelectType()
Modified: brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -70,7 +70,7 @@
}
bool
-PCurveOrSurface::Load(STEPWrapper *sw, SDAI_Select *sse)
+PCurveOrSurface::Load(STEPWrapper *sw, SDAI_Application_instance *sse)
{
step = sw;
Modified: brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.h 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/PCurveOrSurface.h 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -54,7 +54,7 @@
PCurveOrSurface();
virtual ~PCurveOrSurface();
PCurveOrSurface(STEPWrapper *sw, int step_id);
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual void Print(int level);
//static methods
Modified: brlcad/trunk/src/conv/step/step-g/PropertyDefinition.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/PropertyDefinition.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/PropertyDefinition.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -106,7 +106,7 @@
CharacterizedDefinition *aCD = new CharacterizedDefinition();
definition = aCD;
- if (!aCD->Load(step, select)) {
+ if (!aCD->Load(step, (SDAI_Application_instance *)select)) {
std::cout << CLASSNAME << ":Error loading select attribute
'definition' as CharacterizedDefinition from PropertyDefinition." << std::endl;
sw->entity_status[id] = STEP_LOAD_ERROR;
return false;
Modified: brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -60,7 +60,7 @@
}
bool
-RepresentedDefinition::Load(STEPWrapper *sw,SDAI_Select *sse) {
+RepresentedDefinition::Load(STEPWrapper *sw, SDAI_Application_instance *sse) {
step=sw;
//TODO: Need to complete for AP203e2
Modified: brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.h 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/RepresentedDefinition.h 2015-06-10
18:52:54 UTC (rev 65251)
@@ -54,7 +54,7 @@
RepresentedDefinition();
virtual ~RepresentedDefinition();
RepresentedDefinition(STEPWrapper *sw, int step_id);
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual void Print(int level);
//static methods
Modified: brlcad/trunk/src/conv/step/step-g/ShapeDefinition.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/ShapeDefinition.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/ShapeDefinition.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -66,7 +66,7 @@
}
*/
bool
-ShapeDefinition::Load(STEPWrapper *sw,SDAI_Select *sse) {
+ShapeDefinition::Load(STEPWrapper *sw, SDAI_Application_instance *sse) {
step=sw;
if (definition == NULL) {
Modified: brlcad/trunk/src/conv/step/step-g/ShapeDefinition.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/ShapeDefinition.h 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/ShapeDefinition.h 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -60,7 +60,7 @@
ProductDefinitionShape *GetProductDefinitionShape();
ShapeAspect *GetShapeAspect();
ShapeAspectRelationship *GetShapeAspectRelationship();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual bool LoadONBrep(ON_Brep *brep);
virtual void Print(int level);
virtual ShapeDefinition_type ShapeDefinitionType()
Modified: brlcad/trunk/src/conv/step/step-g/SurfaceCurve.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/SurfaceCurve.cpp 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/SurfaceCurve.cpp 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -134,7 +134,7 @@
{
PCurveOrSurface *aPCOS = new PCurveOrSurface();
- if (!aPCOS->Load(step, p_or_s)) {
+ if (!aPCOS->Load(step, (SDAI_Application_instance
*)p_or_s)) {
std::cout << CLASSNAME << ":Error loading
PCurveOrSurface select." << std::endl;
delete aPCOS;
goto step_error;
Modified: brlcad/trunk/src/conv/step/step-g/TrimmedCurve.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/TrimmedCurve.cpp 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/TrimmedCurve.cpp 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -114,7 +114,7 @@
p = static_cast<SDAI_Select *>(sn->node);
TrimmingSelect *aTS = new TrimmingSelect();
- if (p && !aTS->Load(step, p)) {
+ if (p && !aTS->Load(step, (SDAI_Application_instance *)p)) {
std::cout << CLASSNAME << ":Error loading TrimmingSelect
from list." << std::endl;
delete aTS;
goto step_error;
@@ -135,7 +135,7 @@
p = static_cast<SDAI_Select *>(sn->node);
TrimmingSelect *aTS = new TrimmingSelect();
- if (p && !aTS->Load(step, p)) {
+ if (p && !aTS->Load(step, (SDAI_Application_instance *)p)) {
std::cout << CLASSNAME << ":Error loading TrimmingSelect
from list." << std::endl;
delete aTS;
goto step_error;
Modified: brlcad/trunk/src/conv/step/step-g/TrimmingSelect.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/TrimmingSelect.cpp 2015-06-10
18:38:50 UTC (rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/TrimmingSelect.cpp 2015-06-10
18:52:54 UTC (rev 65251)
@@ -87,7 +87,7 @@
}
bool
-TrimmingSelect::Load(STEPWrapper *sw, SDAI_Select *sse)
+TrimmingSelect::Load(STEPWrapper *sw, SDAI_Application_instance *sse)
{
step = sw;
Modified: brlcad/trunk/src/conv/step/step-g/TrimmingSelect.h
===================================================================
--- brlcad/trunk/src/conv/step/step-g/TrimmingSelect.h 2015-06-10 18:38:50 UTC
(rev 65250)
+++ brlcad/trunk/src/conv/step/step-g/TrimmingSelect.h 2015-06-10 18:52:54 UTC
(rev 65251)
@@ -56,7 +56,7 @@
double GetParameterTrim();
const double *GetPointTrim();
bool IsParameterTrim();
- bool Load(STEPWrapper *sw, SDAI_Select *sse);
+ bool Load(STEPWrapper *sw, SDAI_Application_instance *sse);
virtual void Print(int level);
//static methods
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
