Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
d6f5954b
Commit
d6f5954b
authored
Mar 15, 2016
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wb update classes bugfix, public pointers with set size didn't work
parent
508e0a3f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
3 deletions
+22
-3
wb/lib/wb/src/wb_cdrep.cpp
wb/lib/wb/src/wb_cdrep.cpp
+22
-3
No files found.
wb/lib/wb/src/wb_cdrep.cpp
View file @
d6f5954b
...
...
@@ -612,6 +612,7 @@ void wb_cdrep::convertSubClass( pwr_tCid cid, wb_merep *merep,
// Indentify attribute with the same aix
while
(
ODD
(
sts
))
{
bool
found
=
false
;
wb_adrep
*
adrep_target
=
bdrep_target
->
adrep
(
&
sts
);
while
(
ODD
(
sts
))
{
if
(
adrep_source
->
aix
()
==
adrep_target
->
aix
())
{
...
...
@@ -623,6 +624,15 @@ void wb_cdrep::convertSubClass( pwr_tCid cid, wb_merep *merep,
delete
prev
;
}
if
(
found
)
{
if
(
adrep_source
->
flags
()
&
pwr_mAdef_pointer
||
adrep_target
->
flags
()
&
pwr_mAdef_pointer
)
{
wb_adrep
*
prev
=
adrep_source
;
adrep_source
=
adrep_source
->
next
(
&
sts
);
delete
prev
;
delete
adrep_target
;
continue
;
}
if
(
adrep_source
->
isClass
())
{
if
(
adrep_source
->
subClass
()
!=
adrep_target
->
subClass
())
{
wb_adrep
*
prev
=
adrep_source
;
...
...
@@ -658,7 +668,7 @@ void wb_cdrep::convertSubClass( pwr_tCid cid, wb_merep *merep,
int
cidx
=
conv_GetIdx
(
adrep_source
->
type
(),
adrep_target
->
type
());
if
(
cidx
==
conv_eIdx_invalid
)
cidx
=
conv_eIdx_zero
;
/* Zero the attribute */
int
size
=
adrep_target
->
size
()
/
adrep_target
->
nElement
();
pwr_mAdef
flags
;
flags
.
m
=
adrep_target
->
flags
();
...
...
@@ -801,6 +811,15 @@ void wb_cdrep::convertObject( wb_merep *merep, void *rbody, void *dbody,
}
if
(
found
)
{
if
(
adrep_source
->
flags
()
&
pwr_mAdef_pointer
||
adrep_target
->
flags
()
&
pwr_mAdef_pointer
)
{
wb_adrep
*
prev
=
adrep_source
;
adrep_source
=
adrep_source
->
next
(
&
sts
);
delete
prev
;
delete
adrep_target
;
continue
;
}
if
(
adrep_source
->
isClass
())
{
if
(
adrep_source
->
subClass
()
!=
adrep_target
->
subClass
())
{
wb_adrep
*
prev
=
adrep_source
;
...
...
@@ -874,11 +893,11 @@ void wb_cdrep::convertObject( wb_merep *merep, void *rbody, void *dbody,
int
cidx
=
conv_GetIdx
(
adrep_source
->
type
(),
adrep_target
->
type
());
if
(
cidx
==
conv_eIdx_invalid
)
cidx
=
conv_eIdx_zero
;
/* Zero the attribute */
int
size
=
adrep_target
->
size
()
/
adrep_target
->
nElement
();
pwr_mAdef
flags
;
flags
.
m
=
adrep_target
->
flags
();
if
(
!
conv_Fctn
[
cidx
](
adrep_target
->
nElement
(),
adrep_target
->
size
()
/
adrep_target
->
nElement
(),
(
char
*
)
body_target
+
adrep_target
->
offset
(),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment