Set unused inherited opaque pointers to nullptr.

PiperOrigin-RevId: 652444674
Change-Id: I3e82b1e1ae029f2f01ddcdf5ce2ccb45624e7062
This commit is contained in:
Alessio Quaglino
2024-07-15 05:14:45 -07:00
committed by Copybara-Service
parent cf61d88e41
commit 9a7c1df130
3 changed files with 70 additions and 70 deletions
+22 -22
View File
@@ -202,13 +202,13 @@ void mjCMesh::PointToLocal() {
spec.plugin.name = &plugin_name; spec.plugin.name = &plugin_name;
spec.plugin.instance_name = &plugin_instance_name; spec.plugin.instance_name = &plugin_instance_name;
spec.info = &info; spec.info = &info;
file = &file_; file = nullptr;
content_type = &content_type_; content_type = nullptr;
uservert = &vert_; uservert = nullptr;
usernormal = &normal_; usernormal = nullptr;
userface = &face_; userface = nullptr;
usertexcoord = &texcoord_; usertexcoord = nullptr;
userfacetexcoord = &facetexcoord_; userfacetexcoord = nullptr;
} }
@@ -1993,16 +1993,16 @@ void mjCSkin::PointToLocal() {
spec.vertid = &spec_vertid_; spec.vertid = &spec_vertid_;
spec.vertweight = &spec_vertweight_; spec.vertweight = &spec_vertweight_;
spec.info = &info; spec.info = &info;
file = &spec_file_; file = nullptr;
material = &spec_material_; material = nullptr;
vert = &spec_vert_; vert = nullptr;
texcoord = &spec_texcoord_; texcoord = nullptr;
face = &spec_face_; face = nullptr;
bodyname = &spec_bodyname_; bodyname = nullptr;
bindpos = &spec_bindpos_; bindpos = nullptr;
bindquat = &spec_bindquat_; bindquat = nullptr;
vertid = &spec_vertid_; vertid = nullptr;
vertweight = &spec_vertweight_; vertweight = nullptr;
} }
@@ -2399,11 +2399,11 @@ void mjCFlex::PointToLocal() {
spec.texcoord = &spec_texcoord_; spec.texcoord = &spec_texcoord_;
spec.elem = &spec_elem_; spec.elem = &spec_elem_;
spec.info = &info; spec.info = &info;
material = &material_; material = nullptr;
vertbody = &vertbody_; vertbody = nullptr;
vert = &vert_; vert = nullptr;
texcoord = &texcoord_; texcoord = nullptr;
elem = &elem_; elem = nullptr;
} }
+5 -5
View File
@@ -397,11 +397,11 @@ void mjCModel::PointToLocal() {
spec.modelname = &spec_modelname_; spec.modelname = &spec_modelname_;
spec.meshdir = &spec_meshdir_; spec.meshdir = &spec_meshdir_;
spec.texturedir = &spec_texturedir_; spec.texturedir = &spec_texturedir_;
comment = &comment_; comment = nullptr;
modelfiledir = &modelfiledir_; modelfiledir = nullptr;
modelname = &modelname_; modelname = nullptr;
meshdir = &meshdir_; meshdir = nullptr;
texturedir = &texturedir_; texturedir = nullptr;
} }
+43 -43
View File
@@ -952,7 +952,7 @@ void mjCBody::PointToLocal() {
spec.plugin.name = &plugin_name; spec.plugin.name = &plugin_name;
spec.plugin.instance_name = (&plugin_instance_name); spec.plugin.instance_name = (&plugin_instance_name);
spec.info = &info; spec.info = &info;
userdata = &userdata_; userdata = nullptr;
} }
@@ -1778,7 +1778,7 @@ void mjCJoint::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.userdata = &spec_userdata_; spec.userdata = &spec_userdata_;
spec.info = &info; spec.info = &info;
userdata = &spec_userdata_; userdata = nullptr;
} }
@@ -1982,10 +1982,10 @@ void mjCGeom::PointToLocal(void) {
spec.hfieldname = &spec_hfieldname_; spec.hfieldname = &spec_hfieldname_;
spec.plugin.name = &plugin_name; spec.plugin.name = &plugin_name;
spec.plugin.instance_name = &plugin_instance_name; spec.plugin.instance_name = &plugin_instance_name;
userdata = &userdata_; userdata = nullptr;
hfieldname = &hfieldname_; hfieldname = nullptr;
meshname = &meshname_; meshname = nullptr;
material = &material_; material = nullptr;
} }
@@ -2616,8 +2616,8 @@ void mjCSite::PointToLocal() {
spec.info = &info; spec.info = &info;
spec.material = &spec_material_; spec.material = &spec_material_;
spec.userdata = &spec_userdata_; spec.userdata = &spec_userdata_;
userdata = &userdata_; userdata = nullptr;
material = &material_; material = nullptr;
} }
@@ -2767,8 +2767,8 @@ void mjCCamera::PointToLocal() {
spec.userdata = &spec_userdata_; spec.userdata = &spec_userdata_;
spec.targetbody = &spec_targetbody_; spec.targetbody = &spec_targetbody_;
spec.info = &info; spec.info = &info;
userdata = &userdata_; userdata = nullptr;
targetbody = &targetbody_; targetbody = nullptr;
} }
@@ -2919,7 +2919,7 @@ void mjCLight::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.targetbody = &spec_targetbody_; spec.targetbody = &spec_targetbody_;
spec.info = &info; spec.info = &info;
targetbody = &targetbody_; targetbody = nullptr;
} }
@@ -3023,9 +3023,9 @@ void mjCHField::PointToLocal() {
spec.content_type = &spec_content_type_; spec.content_type = &spec_content_type_;
spec.userdata = &spec_userdata_; spec.userdata = &spec_userdata_;
spec.info = &info; spec.info = &info;
file = &file_; file = nullptr;
content_type = &content_type_; content_type = nullptr;
userdata = &userdata_; userdata = nullptr;
} }
@@ -3251,9 +3251,9 @@ void mjCTexture::PointToLocal() {
spec.content_type = &spec_content_type_; spec.content_type = &spec_content_type_;
spec.cubefiles = &spec_cubefiles_; spec.cubefiles = &spec_cubefiles_;
spec.info = &info; spec.info = &info;
file = &file_; file = nullptr;
content_type = &content_type_; content_type = nullptr;
cubefiles = &cubefiles_; cubefiles = nullptr;
} }
@@ -3970,7 +3970,7 @@ void mjCMaterial::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.texture = &spec_texture_; spec.texture = &spec_texture_;
spec.info = &info; spec.info = &info;
texture = &texture_; texture = nullptr;
} }
@@ -4059,8 +4059,8 @@ void mjCPair::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.geomname1 = &spec_geomname1_; spec.geomname1 = &spec_geomname1_;
spec.geomname2 = &spec_geomname2_; spec.geomname2 = &spec_geomname2_;
geomname1 = &geomname1_; geomname1 = nullptr;
geomname2 = &geomname2_; geomname2 = nullptr;
spec.info = &info; spec.info = &info;
} }
@@ -4284,8 +4284,8 @@ void mjCBodyPair::PointToLocal() {
spec.bodyname1 = &spec_bodyname1_; spec.bodyname1 = &spec_bodyname1_;
spec.bodyname2 = &spec_bodyname2_; spec.bodyname2 = &spec_bodyname2_;
spec.info = &info; spec.info = &info;
bodyname1 = &bodyname1_; bodyname1 = nullptr;
bodyname2 = &bodyname2_; bodyname2 = nullptr;
} }
@@ -4418,8 +4418,8 @@ void mjCEquality::PointToLocal() {
spec.name1 = &spec_name1_; spec.name1 = &spec_name1_;
spec.name2 = &spec_name2_; spec.name2 = &spec_name2_;
spec.info = &info; spec.info = &info;
name1 = &name1_; name1 = nullptr;
name2 = &name2_; name2 = nullptr;
} }
@@ -4586,8 +4586,8 @@ void mjCTendon::PointToLocal() {
spec.material = &spec_material_; spec.material = &spec_material_;
spec.userdata = &spec_userdata_; spec.userdata = &spec_userdata_;
spec.info = &info; spec.info = &info;
material = &material_; material = nullptr;
userdata = &userdata_; userdata = nullptr;
} }
@@ -5070,10 +5070,10 @@ void mjCActuator::PointToLocal() {
spec.plugin.name = &plugin_name; spec.plugin.name = &plugin_name;
spec.plugin.instance_name = &plugin_instance_name; spec.plugin.instance_name = &plugin_instance_name;
spec.info = &info; spec.info = &info;
userdata = &userdata_; userdata = nullptr;
target = &target_; target = nullptr;
refsite = &refsite_; refsite = nullptr;
slidersite = &slidersite_; slidersite = nullptr;
} }
@@ -5393,9 +5393,9 @@ void mjCSensor::PointToLocal() {
spec.plugin.name = &plugin_name; spec.plugin.name = &plugin_name;
spec.plugin.instance_name = &plugin_instance_name; spec.plugin.instance_name = &plugin_instance_name;
spec.info = &info; spec.info = &info;
userdata = &userdata_; userdata = nullptr;
objname = &objname_; objname = nullptr;
refname = &refname_; refname = nullptr;
} }
@@ -5891,7 +5891,7 @@ void mjCNumeric::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.data = &spec_data_; spec.data = &spec_data_;
spec.info = &info; spec.info = &info;
data = &data_; data = nullptr;
} }
@@ -5980,7 +5980,7 @@ void mjCText::PointToLocal() {
spec.name = &name; spec.name = &name;
spec.data = &spec_data_; spec.data = &spec_data_;
spec.info = &info; spec.info = &info;
data = &data_; data = nullptr;
} }
@@ -6062,8 +6062,8 @@ void mjCTuple::PointToLocal() {
spec.objname = &spec_objname_; spec.objname = &spec_objname_;
spec.objprm = &spec_objprm_; spec.objprm = &spec_objprm_;
spec.info = &info; spec.info = &info;
objname = &objname_; objname = nullptr;
objprm = &objprm_; objprm = nullptr;
} }
@@ -6200,12 +6200,12 @@ void mjCKey::PointToLocal() {
spec.mquat = &spec_mquat_; spec.mquat = &spec_mquat_;
spec.ctrl = &spec_ctrl_; spec.ctrl = &spec_ctrl_;
spec.info = &info; spec.info = &info;
qpos = &qpos_; qpos = nullptr;
qvel = &qvel_; qvel = nullptr;
act = &act_; act = nullptr;
mpos = &mpos_; mpos = nullptr;
mquat = &mquat_; mquat = nullptr;
ctrl = &ctrl_; ctrl = nullptr;
} }