diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-02 11:36:47 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2008-04-02 11:36:47 +0000 |
| commit | f0bd559e72763039b2fdb189114fffd2e03747bc (patch) | |
| tree | 499b544db4db0ecb6226606dcd7ca8770e003a74 | |
| parent | 0e99a34f30e33703cff57a8406129089b3c7c815 (diff) | |
| download | ATCD-f0bd559e72763039b2fdb189114fffd2e03747bc.tar.gz | |
ChangeLogTag: Wed Apr 2 11:33:48 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp | 1 | ||||
| -rw-r--r-- | TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 998b0083b38..29f75c9024e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Wed Apr 2 11:33:48 UTC 2008 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp: + Fixed a warning. + + * tests/Collocated_Forwarding/Collocated_Forwarding.mpc: + Added avoids_minimum_corba, avoids_corba_e_compact, and + avoids_corba_e_micro. + Tue Apr 1 14:57:12 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Collocated_Forwarding/run_test.pl: diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp index 7fd09191dd4..184c4c28692 100644 --- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp +++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp @@ -52,6 +52,7 @@ TAO::Direct_Collocation_Upcall_Wrapper::upcall ( } #else ACE_UNUSED_ARG (forward_obj); + ACE_UNUSED_ARG (is_forwarded); #endif /* TAO_HAS_MINIMUM_CORBA && !CORBA_E_COMPACT && !CORBA_E_MICRO*/ } diff --git a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc index 62c4013b38d..55cd8c54a5a 100644 --- a/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc +++ b/TAO/tests/Collocated_Forwarding/Collocated_Forwarding.mpc @@ -9,7 +9,7 @@ project(*idl): taoidldefaults { custom_only = 1 } -project(*Server): taoserver, iormanip, pi_server, messaging { +project(*Server): taoserver, iormanip, pi_server, messaging, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { after += *idl Source_Files { test_i.cpp |