diff options
| author | Sverker Eriksson <[email protected]> | 2013-01-28 10:40:33 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-01-28 10:41:03 +0100 |
| commit | ccee9910becf9df9830c0b2bc689b3f67620cd6a (patch) | |
| tree | 5cab8b3d4e7e080ce5862df2d5a8d74d915bb8d6 /lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c | |
| parent | b5c654bd8f072754a6b7823c53c3106c026871f7 (diff) | |
| parent | 1919bb75f74db7f7c36ab5237cfa5d5371e047df (diff) | |
| download | otp-ccee9910becf9df9830c0b2bc689b3f67620cd6a.tar.gz otp-ccee9910becf9df9830c0b2bc689b3f67620cd6a.tar.bz2 otp-ccee9910becf9df9830c0b2bc689b3f67620cd6a.zip | |
Merge branch 'sverk/ic/tests'
* sverk/ic/tests:
ic: Making tests pass after changes in erl_interface and jinterface
ic: Revert --enable-silent-rules for test Makefile
OTP-10785
Diffstat (limited to 'lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c')
| -rw-r--r-- | lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c b/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c index c423a9e51c..d813cae45a 100644 --- a/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c +++ b/lib/ic/test/erl_client_c_server_proto_SUITE_data/callbacks.c @@ -494,10 +494,12 @@ m_i_port_test__rs* m_i_port_test__cb(CORBA_Object oe_obj, m_i_port_test__rs* rs = NULL; strcpy((*a).node,(*b).node); + a->node_org_enc = b->node_org_enc; (*a).id = (*b).id; (*a).creation = 0; strcpy((*c).node,(*b).node); + c->node_org_enc = b->node_org_enc; (*c).id = (*b).id; (*c).creation = 0; return rs; @@ -514,6 +516,7 @@ m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj, m_i_ref_test__rs* rs = NULL; strcpy((*a).node,(*b).node); + a->node_org_enc = b->node_org_enc; /*(*a).id = (*b).id;*/ (*a).len = (*b).len; (*a).n[0] = (*b).n[0]; @@ -522,6 +525,7 @@ m_i_ref_test__rs* m_i_ref_test__cb(CORBA_Object oe_obj, (*a).creation = 0; strcpy((*c).node,(*b).node); + c->node_org_enc = b->node_org_enc; /*(*c).id = (*b).id;*/ (*c).len = (*b).len; (*c).n[0] = (*b).n[0]; @@ -557,6 +561,7 @@ m_i_typedef_test__rs* m_i_typedef_test__cb(CORBA_Object oe_obj, *d = *b; strcpy((*e).node,(*c).node); + e->node_org_enc = c->node_org_enc; (*e).id = (*c).id; (*e).creation = 0; *a = 4711; |