diff options
| -rw-r--r-- | TAO/tao/DomainC.h | 2 | ||||
| -rw-r--r-- | TAO/tao/DomainC.i | 5 | ||||
| -rw-r--r-- | TAO/tao/InterceptorC.h | 2 | ||||
| -rw-r--r-- | TAO/tao/InterceptorC.i | 5 | ||||
| -rw-r--r-- | TAO/tao/PolicyC.h | 2 | ||||
| -rw-r--r-- | TAO/tao/PolicyC.i | 5 | ||||
| -rw-r--r-- | TAO/tao/diffs/InterceptorC.h.diff | 8 | ||||
| -rw-r--r-- | TAO/tao/diffs/InterceptorC.i.diff | 8 | ||||
| -rw-r--r-- | TAO/tao/diffs/PolicyC.h.diff | 2 | ||||
| -rw-r--r-- | TAO/tao/diffs/PolicyC.i.diff | 8 |
10 files changed, 28 insertions, 19 deletions
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h index 5169a0a5539..707aa7569fb 100644 --- a/TAO/tao/DomainC.h +++ b/TAO/tao/DomainC.h @@ -39,7 +39,7 @@ class TAO_Export CORBA_DomainManager_var : public TAO_Base_var { public: CORBA_DomainManager_var (void); // default constructor - CORBA_DomainManager_var (CORBA_DomainManager_ptr); + CORBA_DomainManager_var (CORBA_DomainManager_ptr p) : ptr_ (p) {} CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor ~CORBA_DomainManager_var (void); // destructor diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i index ed874984ce8..2b3834f6035 100644 --- a/TAO/tao/DomainC.i +++ b/TAO/tao/DomainC.i @@ -33,11 +33,6 @@ CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor : ptr_ (CORBA::DomainManager::_nil ()) {} -ACE_INLINE -CORBA_DomainManager_var::CORBA_DomainManager_var (CORBA::DomainManager_ptr p) - : ptr_ (p) -{} - ACE_INLINE CORBA::DomainManager_ptr CORBA_DomainManager_var::ptr (void) const { diff --git a/TAO/tao/InterceptorC.h b/TAO/tao/InterceptorC.h index 83b93072b2b..6d6946cb26d 100644 --- a/TAO/tao/InterceptorC.h +++ b/TAO/tao/InterceptorC.h @@ -63,7 +63,7 @@ TAO_NAMESPACE PortableInterceptor { public: Cookie_var (void); // default constructor - Cookie_var (Cookie_ptr); + Cookie_var (Cookie_ptr p) : ptr_ (p) {} Cookie_var (const Cookie_var &); // copy constructor ~Cookie_var (void); // destructor diff --git a/TAO/tao/InterceptorC.i b/TAO/tao/InterceptorC.i index 35069939dd8..042fc25c597 100644 --- a/TAO/tao/InterceptorC.i +++ b/TAO/tao/InterceptorC.i @@ -28,11 +28,6 @@ PortableInterceptor::Cookie_var::Cookie_var (void) // default constructor : ptr_ (Cookie::_nil ()) {} -ACE_INLINE -PortableInterceptor::Cookie_var::Cookie_var (Cookie_ptr p) - : ptr_ (p) -{} - ACE_INLINE ::PortableInterceptor::Cookie_ptr PortableInterceptor::Cookie_var::ptr (void) const { diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 7c89cec29c0..ef78d9a2632 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -110,7 +110,7 @@ class TAO_Export CORBA_Policy_var : public TAO_Base_var { public: CORBA_Policy_var (void); // default constructor - CORBA_Policy_var (CORBA_Policy_ptr); + CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {} CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor ~CORBA_Policy_var (void); // destructor diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index 074bf947f83..40e2e079bbf 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -71,11 +71,6 @@ CORBA_Policy_var::CORBA_Policy_var (void) // default constructor : ptr_ (CORBA_Policy::_nil ()) {} -ACE_INLINE -CORBA_Policy_var::CORBA_Policy_var (CORBA_Policy_ptr p) - : ptr_ (p) -{} - ACE_INLINE CORBA_Policy_ptr CORBA_Policy_var::ptr (void) const { diff --git a/TAO/tao/diffs/InterceptorC.h.diff b/TAO/tao/diffs/InterceptorC.h.diff index 93fdcda00f8..c1986910626 100644 --- a/TAO/tao/diffs/InterceptorC.h.diff +++ b/TAO/tao/diffs/InterceptorC.h.diff @@ -37,6 +37,14 @@ TAO_NAMESPACE PortableInterceptor { +@@ -61,6 +63,6 @@ + { + public: + Cookie_var (void); // default constructor +- Cookie_var (Cookie_ptr); ++ Cookie_var (Cookie_ptr p) : ptr_ (p) {} + Cookie_var (const Cookie_var &); // copy constructor + ~Cookie_var (void); // destructor @@ -745,6 +747,8 @@ #if defined (__ACE_INLINE__) #include "InterceptorC.i" diff --git a/TAO/tao/diffs/InterceptorC.i.diff b/TAO/tao/diffs/InterceptorC.i.diff new file mode 100644 index 00000000000..7794d5662d1 --- /dev/null +++ b/TAO/tao/diffs/InterceptorC.i.diff @@ -0,0 +1,8 @@ +@@ -23,7 +23,2 @@ +-ACE_INLINE +-PortableInterceptor::Cookie_var::Cookie_var (Cookie_ptr p) +- : ptr_ (p) +-{} +- +ACE_INLINE ::PortableInterceptor::Cookie_ptr +PortableInterceptor::Cookie_var::ptr (void) const diff --git a/TAO/tao/diffs/PolicyC.h.diff b/TAO/tao/diffs/PolicyC.h.diff index dc47b2d6d01..61b6a63a443 100644 --- a/TAO/tao/diffs/PolicyC.h.diff +++ b/TAO/tao/diffs/PolicyC.h.diff @@ -399,7 +399,7 @@ - Policy_ptr _retn (void); - Policy_ptr ptr (void) const; + CORBA_Policy_var (void); // default constructor -+ CORBA_Policy_var (CORBA_Policy_ptr); ++ CORBA_Policy_var (CORBA_Policy_ptr p) : ptr_ (p) {} + CORBA_Policy_var (const CORBA_Policy_var &); // copy constructor + ~CORBA_Policy_var (void); // destructor + diff --git a/TAO/tao/diffs/PolicyC.i.diff b/TAO/tao/diffs/PolicyC.i.diff new file mode 100644 index 00000000000..17d5ad87e14 --- /dev/null +++ b/TAO/tao/diffs/PolicyC.i.diff @@ -0,0 +1,8 @@ +@@ -418,7 +418,2 @@ +-ACE_INLINE +-CORBA::Policy_var::Policy_var (Policy_ptr p) +- : ptr_ (p) +-{} +- +ACE_INLINE ::CORBA::Policy_ptr +CORBA::Policy_var::ptr (void) const |