diff options
Diffstat (limited to 'TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp')
| -rw-r--r-- | TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp index 883674d990f..689a44642ae 100644 --- a/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp +++ b/TAO/orbsvcs/PSS/PSDL_Interface_Visitor.cpp @@ -457,13 +457,9 @@ TAO_PSDL_Interface_Visitor::print_class_for_interface (void) ps_sh->incr_indent (0); *ps_sh << "public:"; ps_sh->nl (); - *ps_sh << "#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)" - ; + *ps_sh << "typedef " << this->interface_name_ << "_ptr _ptr_type;"; ps_sh->nl (); *ps_sh << "typedef " << this->interface_name_ << "_var _var_type;"; ps_sh->nl (); - *ps_sh << "#endif /* ! __GNUC__ || g++ >= 2.8 */"; ps_sh->nl (); - - *ps_sh << "static int _tao_class_id;"; ps_sh->nl (); @@ -1904,7 +1900,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void) ps_si->nl (); *ps_si << "(ptrdiff_t,"; ps_si->nl (); *ps_si << "&" << this->interface_name_ << "::_tao_class_id))"; ps_si->nl (); - *ps_si << "retv = ACE_reinterpret_cast (void*, this);"; + *ps_si << "retv = reinterpret_cast<void*> (this);"; ps_si->decr_indent (0); ps_si->nl (); @@ -1917,7 +1913,7 @@ TAO_PSDL_Interface_Visitor::gen_code_for_si (void) *ps_si << "retv = ACE_reinterpret_cast (void *,"; ps_si->incr_indent (0); ps_si->nl (); - *ps_si << "ACE_static_cast (CORBA::Object_ptr, this));"; + *ps_si << "static_cast<CORBA::Object_ptr> (this));"; ps_si->decr_indent (0); ps_si->decr_indent (0); |