diff options
| author | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-27 04:11:31 +0000 |
|---|---|---|
| committer | marina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-27 04:11:31 +0000 |
| commit | e6b9cf1c4e6fffedeb6cd6054d7c085c856bb9ff (patch) | |
| tree | 7337b26abdcb3a5e85bf0b7292eae4f601dbb285 | |
| parent | 04d88e23e22c7def0a6eeb181635ea722f59750f (diff) | |
| download | ATCD-e6b9cf1c4e6fffedeb6cd6054d7c085c856bb9ff.tar.gz | |
ChangeLogTag:Sat Aug 26 23:07:56 2000 Marina Spivak <marina@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/Policy_Manager.i | 11 |
3 files changed, 17 insertions, 11 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 80008ad111a..e65a8ed4d5f 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Sat Aug 26 23:07:56 2000 Marina Spivak <marina@cs.wustl.edu> + + * tao/Policy_Manager.i + * tao/Policy_Manager.cpp: + + Moved TAO_Policy_Manager_Impl::server_protocol + (TAO_ServerProtocolPolicy *server_protocol) method + implementation from .i to .cpp. If inlining is on, .i does not + have enough includes to compile the method. + Sat Aug 26 22:58:10 2000 Balachandran Natarajan <bala@cs.wustl.edu> * Updated dependencies for the Makefiles in diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index 18fa1a0fd9e..90d673ac13f 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -1122,6 +1122,13 @@ TAO_Policy_Manager_Impl::client_protocol (void) const return result; } +void +TAO_Policy_Manager_Impl::server_protocol (TAO_ServerProtocolPolicy *server_protocol) +{ + CORBA::release (this->server_protocol_); + this->server_protocol_ = server_protocol; +} + #endif /* TAO_HAS_RT_CORBA == 1 */ // **************************************************************** diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 75a089c5ed8..68507d5c23b 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -40,17 +40,6 @@ TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void) #endif /* TAO_HAS_RT_CORBA == 1 */ } -#if (TAO_HAS_RT_CORBA == 1) - -ACE_INLINE void -TAO_Policy_Manager_Impl::server_protocol (TAO_ServerProtocolPolicy *server_protocol) -{ - CORBA::release (this->server_protocol_); - this->server_protocol_ = server_protocol; -} - -#endif /* TAO_HAS_RT_CORBA == 1 */ - // **************************************************************** ACE_INLINE |