From a7c03cabf931b077d70c6f80ec02c7728a429f49 Mon Sep 17 00:00:00 2001 From: brunsch Date: Sun, 23 Apr 2000 04:43:59 +0000 Subject: ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch --- ace/Service_Object.i | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'ace/Service_Object.i') diff --git a/ace/Service_Object.i b/ace/Service_Object.i index 184b48a7da2..85e4d64278f 100644 --- a/ace/Service_Object.i +++ b/ace/Service_Object.i @@ -20,23 +20,13 @@ ACE_Service_Object_Ptr::operator-> () return this->service_object_; } -ACE_INLINE const ASYS_TCHAR * +ACE_INLINE const ACE_TCHAR * ACE_Service_Type::name (void) const { ACE_TRACE ("ACE_Service_Type::name"); return this->name_; } -ACE_INLINE const char * -ACE_Service_Type::chname (void) const -{ -#if !defined (ACE_HAS_MOSTLY_UNICODE_APIS) - return this->name (); -#else - return this->chname_; -#endif /* !ACE_HAS_MOSTLY_UNICODE_APIS */ -} - ACE_INLINE const ACE_Service_Type_Impl * ACE_Service_Type::type (void) const { @@ -52,16 +42,12 @@ ACE_Service_Type::handle (void) const } ACE_INLINE void -ACE_Service_Type::name (const ASYS_TCHAR *n) +ACE_Service_Type::name (const ACE_TCHAR *n) { ACE_TRACE ("ACE_Service_Type::name"); - delete [] (ASYS_TCHAR *) this->name_; + delete [] (ACE_TCHAR *) this->name_; this->name_ = ACE::strnew (n); -#if defined (ACE_HAS_MOSTLY_UNICODE_APIS) - delete [] (char *) this->chname_; - this->chname_ = ACE_OS_WString (this->name_).char_rep (); -#endif /* !ACE_HAS_MOSTLY_UNICODE_APIS */ } ACE_INLINE void -- cgit v1.2.1