diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-21 17:44:56 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-21 17:44:56 +0000 |
| commit | beb7f743a7357c47b0f682e954e430fe51fb1d5a (patch) | |
| tree | 8638ef00553972d69ee52f53028b8e185de773f1 | |
| parent | 177c2985dd7f463c052ecf38e1bb8b5efa1ea478 (diff) | |
| download | ATCD-beb7f743a7357c47b0f682e954e430fe51fb1d5a.tar.gz | |
ChangeLogTag: Fri Mar 21 11:41:10 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 4 | ||||
| -rw-r--r-- | TAO/tao/Policy_ForwardC.cpp | 7 | ||||
| -rw-r--r-- | TAO/tests/AMH_Exceptions/client.dsp | 4 | ||||
| -rw-r--r-- | TAO/tests/Param_Test/anyop.cpp | 4 |
4 files changed, 17 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8098dc9f0ab..d2301478833 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -8,6 +8,10 @@ Fri Mar 21 11:41:10 2003 Jeff Parsons <j.parsons@vanderbilt.edu> Added generated file to the project. + * tests/Param_Test/anyop.cpp: + + Added missing .inout() to a _var reference. + Thu Mar 20 18:29:10 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * tao/PortableServer/ImplRepoC.cpp: diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp index 6ba313bf0ae..f38eaac0be1 100644 --- a/TAO/tao/Policy_ForwardC.cpp +++ b/TAO/tao/Policy_ForwardC.cpp @@ -603,6 +603,13 @@ CORBA::Boolean operator>>= ( ); } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \ + defined (ACE_HAS_GNU_REPO) + template class TAO::Any_Dual_Impl_T<CORBA::PolicyList>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +# pragma instantiate TAO::Any_Dual_Impl_T<CORBA::PolicyList> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54 diff --git a/TAO/tests/AMH_Exceptions/client.dsp b/TAO/tests/AMH_Exceptions/client.dsp index 9de4e29309f..c52cdcdf6a3 100644 --- a/TAO/tests/AMH_Exceptions/client.dsp +++ b/TAO/tests/AMH_Exceptions/client.dsp @@ -101,6 +101,10 @@ SOURCE=.\TestC.cpp # Begin Group "Header Files"
# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\testC.h
+# End Source File
# End Group
# Begin Group "IDL Files"
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp index 9a59d2d267b..153a1366d56 100644 --- a/TAO/tests/Param_Test/anyop.cpp +++ b/TAO/tests/Param_Test/anyop.cpp @@ -121,9 +121,9 @@ main (int argc, char *argv[]) "Mismatched Param_Test extraction\n")); } - CORBA::Object_ptr other; + CORBA::Object_var other; - if (!(any >>= CORBA::Any::to_object (other))) + if (!(any >>= CORBA::Any::to_object (other.inout ()))) { ACE_DEBUG ((LM_DEBUG, "Cannot extract Param_Test as Object\n")); |