diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 17:41:31 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-07 17:41:31 +0000 |
| commit | bd0f8e511f96f12f3963ec6aee77a28b6fc2da40 (patch) | |
| tree | 725c98603106287e761deeee14db174ccf1129b1 | |
| parent | e05782334823c1198602319f1445a16e949baee4 (diff) | |
| download | ATCD-bd0f8e511f96f12f3963ec6aee77a28b6fc2da40.tar.gz | |
ChangeLogTag:Wed Apr 7 12:40:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 8 | ||||
| -rw-r--r-- | TAO/tao/POA.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/PolicyC.cpp | 14 |
3 files changed, 15 insertions, 11 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 2312d718c97..2da7d9fab1b 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,11 @@ +Wed Apr 7 12:40:46 1999 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tao/PolicyC.cpp: + Fixed syntax error, Sun/CC is *way* too lax. + + * tao/POA.cpp: + Fixed duplicate template instantiations. + Wed Apr 7 12:03:33 1999 Carlos O'Ryan <coryan@cs.wustl.edu> * tao/Makefile: diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index 4f2d7ded228..8bb4571a408 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -3130,8 +3130,6 @@ template class ACE_Write_Guard<ACE_Lock>; template class ACE_Read_Guard<ACE_Lock>; template class ACE_Unbounded_Set<TAO_POA *>; template class ACE_Unbounded_Set_Iterator<TAO_POA *>; -template class TAO_Object_Manager<CORBA::Policy>; -template class TAO_Unbounded_Object_Sequence<CORBA::Policy>; template class auto_ptr<TAO_Id_Assignment_Policy>; template class auto_ptr<TAO_Id_Uniqueness_Policy>; template class auto_ptr<TAO_Lifespan_Policy>; @@ -3192,8 +3190,6 @@ template class ACE_Node<TAO_POA *>; #pragma instantiate ACE_Read_Guard<ACE_Lock> #pragma instantiate ACE_Unbounded_Set<TAO_POA *> #pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *> -#pragma instantiate TAO_Object_Manager<CORBA::Policy> -#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy> #pragma instantiate auto_ptr<TAO_Id_Assignment_Policy> #pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy> #pragma instantiate auto_ptr<TAO_Lifespan_Policy> diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 2094df65f09..0295fcc1c21 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -375,7 +375,7 @@ CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max) // uses max size CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release) : TAO_Unbounded_Sequence<CORBA::ULong> (max, length, buffer, release) {} -CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const PolicyTypeSeq &seq) +CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq) : TAO_Unbounded_Sequence<CORBA::ULong> (seq) {} CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void) @@ -931,14 +931,14 @@ template class TAO_Unbounded_Sequence<CORBA::ULong>; template class TAO_Unbounded_Object_Sequence<CORBA_Policy>; template class TAO_Object_Manager<CORBA_Policy>; - template class TAO_Object_Field_T<CORBA_Policy>; - template class TAO_Object_Field_T<CORBA_PolicyManager>; - template class TAO_Object_Field_T<CORBA_PolicyCurrent>; +// template class TAO_Object_Field_T<CORBA_Policy>; +// template class TAO_Object_Field_T<CORBA_PolicyManager>; +// template class TAO_Object_Field_T<CORBA_PolicyCurrent>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate TAO_Object_Field_T<CORBA_Policy> -# pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager> -# pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent> +//# pragma instantiate TAO_Object_Field_T<CORBA_Policy> +//# pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager> +//# pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |