diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-23 03:10:18 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2002-08-23 03:10:18 +0000 |
| commit | 24d50122c3c0a54d56f273a7fd3c783a2cd934b2 (patch) | |
| tree | 923ac6126c3cbd63df344da235d34345d5e05c47 | |
| parent | 565787faaf9ee87768d79c43fb0b34bba6fdde4b (diff) | |
| download | ATCD-24d50122c3c0a54d56f273a7fd3c783a2cd934b2.tar.gz | |
ChangeLogTag:Thu Aug 22 20:08:47 2002 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.i | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b27b00d645c..270c21e5b5f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 22 20:08:47 2002 Ossama Othman <ossama@uci.edu> + + * tao/PortableServer/POA.i (reference_to_servant): + + Added missing ACE_INLINE declaration. Fixes a "multiple + definition" link-time errors. + Thu Aug 22 16:00:59 2002 Ossama Othman <ossama@uci.edu> * orbsvcs/LoadBalancer/README: diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i index 8eacd7687bd..198a2492aa0 100644 --- a/TAO/tao/PortableServer/POA.i +++ b/TAO/tao/PortableServer/POA.i @@ -1,3 +1,5 @@ +// -*- C++ -*- +// // $Id$ // Exception macros @@ -332,7 +334,7 @@ TAO_POA::servant_to_system_id (PortableServer::Servant servant, ACE_ENV_ARG_PARAMETER); } -PortableServer::Servant +ACE_INLINE PortableServer::Servant TAO_POA::reference_to_servant (CORBA::Object_ptr reference ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, |