diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-13 21:32:56 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-13 21:32:56 +0000 |
| commit | ffe788eeeda0489765ac5c769f2b512fa412a104 (patch) | |
| tree | f0cf32d63a76de4f0c4333e0c0a6cc9d7d0c0b49 | |
| parent | 3e0e4aa61896e5664022641eae70c6cad72c3cce (diff) | |
| download | ATCD-ffe788eeeda0489765ac5c769f2b512fa412a104.tar.gz | |
Minor fix needed due to merging error.
| -rw-r--r-- | TAO/tao/RTPortableServer/RTPortableServerC.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h index 3db70339310..b4ef0ad232e 100644 --- a/TAO/tao/RTPortableServer/RTPortableServerC.h +++ b/TAO/tao/RTPortableServer/RTPortableServerC.h @@ -95,11 +95,11 @@ TAO_NAMESPACE RTPortableServer // Hooks used by template sequence and object manager classes // for non-defined forward declared interfaces. - static POA_ptr duplicate (POA_ptr); - static void release (POA_ptr); - static POA_ptr nil (void); - static POA_ptr narrow (CORBA::Object *, CORBA::Environment &); - static CORBA::Object * upcast (void *); + static POA_ptr tao_duplicate (POA_ptr); + static void tao_release (POA_ptr); + static POA_ptr tao_nil (void); + static POA_ptr tao_narrow (CORBA::Object *, CORBA::Environment &); + static CORBA::Object * tao_upcast (void *); private: POA_ptr ptr_; |