diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-04-25 12:07:49 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-04-25 12:07:49 +0000 |
| commit | 7b918d2bf25d43d9dd070c5907b14ff28acb09d8 (patch) | |
| tree | 22e11cec8395b446f2fee383a33629a4d9329caa | |
| parent | c767e27aa868e211ffcb6953784d561ac611a269 (diff) | |
| download | ATCD-7b918d2bf25d43d9dd070c5907b14ff28acb09d8.tar.gz | |
ChangeLogTag:Fri Apr 25 07:06:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/PortableServerC.i | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e6b80614165..98bc2f74d4e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 25 07:06:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/PortableServer/PortableServerC.i: Added #if + (TAO_HAS_MINIMUM_POA == 0) guards in a few places to get the + file compiling cleanly in minimum builds. + Fri Apr 25 06:27:06 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/PortableServer/ObjectReferenceTemplate.cpp: Fixed a compile diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index 1f2816eb6b4..be6ef6a2b36 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -26,6 +26,7 @@ #if !defined (_PORTABLESERVER_THREADPOLICY___CI_) #define _PORTABLESERVER_THREADPOLICY___CI_ +#if (TAO_HAS_MINIMUM_POA == 0) template<> ACE_INLINE CORBA::Boolean @@ -52,6 +53,7 @@ TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &) { return 0; } +#endif /*TAO_HAS_MINIMUM_POA*/ #endif /* end #if !defined */ @@ -158,9 +160,9 @@ TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputC #endif /* end #if !defined */ +#if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 - #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_) #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_ template<> @@ -190,6 +192,7 @@ TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_ return 0; } + #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -227,6 +230,7 @@ TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_In #endif /* end #if !defined */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 @@ -261,6 +265,8 @@ TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_I #endif /* end #if !defined */ +#endif /*TAO_HAS_MINIMUM_POA == 0 */ + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 @@ -296,6 +302,7 @@ TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &) #endif /* end #if !defined */ +#if (TAO_HAS_MINIMUM_POA == 0) // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 @@ -434,6 +441,7 @@ TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR & #endif /* end #if !defined */ +#endif /*TAO_HAS_MINIMUM_POA == 0*/ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68 |