diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-04-28 12:08:52 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-04-28 12:08:52 +0000 |
| commit | 0d63c43f4e960d1c8d4f130a8f5f35002065f55b (patch) | |
| tree | 78b26199c06aa32cbc40bd0ee7656726270d3ed3 | |
| parent | f2846b7aca351c138e1f402c8ed1fd7b37e26872 (diff) | |
| download | ATCD-0d63c43f4e960d1c8d4f130a8f5f35002065f55b.tar.gz | |
ChangeLogTag:Mon Apr 28 07:05:55 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/PortableServerC.i | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 67d6c98bd59..142bcb4c92f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Apr 28 07:05:55 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/PortableServer/PortableServerC.i (demarshal_value): Added + ACE_INLINE to marshal_value and demarshal_value. This should fix + link errors in MSVC6. + Mon Apr 28 06:52:40 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/IOP_IORC.cpp: Removed duplicate explicit template diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index bef6f6f08a7..79b311c9d9e 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -58,14 +58,14 @@ TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ template<> -CORBA::Boolean +ACE_INLINE CORBA::Boolean TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &) { return 0; } template<> -CORBA::Boolean +ACE_INLINE CORBA::Boolean TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &) { return 0; |