diff options
Diffstat (limited to 'ACE/ace')
256 files changed, 2439 insertions, 2438 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index 5df2f47d9bd..65c78af9252 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -127,7 +127,7 @@ ACE::compiler_name (void) #ifdef ACE_CC_NAME return ACE_CC_NAME; #else - return ACE_LIB_TEXT (""); + return ACE_TEXT (""); #endif } @@ -287,14 +287,14 @@ const ACE_TCHAR * ACE::execname (const ACE_TCHAR *old_name) { #if defined (ACE_WIN32) - const ACE_TCHAR *suffix = ACE_OS::strrchr (old_name, ACE_LIB_TEXT ('.')); - if (suffix == 0 || ACE_OS::strcasecmp (suffix, ACE_LIB_TEXT (".exe")) != 0) + const ACE_TCHAR *suffix = ACE_OS::strrchr (old_name, ACE_TEXT ('.')); + if (suffix == 0 || ACE_OS::strcasecmp (suffix, ACE_TEXT (".exe")) != 0) { ACE_TCHAR *new_name; size_t size = ACE_OS::strlen (old_name) - + ACE_OS::strlen (ACE_LIB_TEXT (".exe")) + + ACE_OS::strlen (ACE_TEXT (".exe")) + 1; ACE_NEW_RETURN (new_name, @@ -306,7 +306,7 @@ ACE::execname (const ACE_TCHAR *old_name) // Concatenate the .exe suffix onto the end of the executable. // end points _after_ the terminating nul. - ACE_OS::strcpy (end - 1, ACE_LIB_TEXT (".exe")); + ACE_OS::strcpy (end - 1, ACE_TEXT (".exe")); return new_name; } @@ -2322,13 +2322,13 @@ ACE::format_hexdump (const char *buffer, { c = (u_char) buffer[(i << 4) + j]; // or, buffer[i*16+j] ACE_OS::sprintf (obuf, - ACE_LIB_TEXT ("%02x "), + ACE_TEXT ("%02x "), c); obuf += 3; if (j == 7) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); + ACE_TEXT (" ")); ++obuf; } textver[j] = ACE_OS::ace_isprint (c) ? c : '.'; @@ -2337,7 +2337,7 @@ ACE::format_hexdump (const char *buffer, textver[j] = 0; ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" %s\n"), + ACE_TEXT (" %s\n"), textver); while (*obuf != '\0') @@ -2350,13 +2350,13 @@ ACE::format_hexdump (const char *buffer, { c = (u_char) buffer[size - size % 16 + i]; ACE_OS::sprintf (obuf, - ACE_LIB_TEXT ("%02x "), + ACE_TEXT ("%02x "), c); obuf += 3; if (i == 7) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); + ACE_TEXT (" ")); ++obuf; } textver[i] = ACE_OS::ace_isprint (c) ? c : '.'; @@ -2365,12 +2365,12 @@ ACE::format_hexdump (const char *buffer, for (i = size % 16; i < 16; i++) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); + ACE_TEXT (" ")); obuf += 3; if (i == 7) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); + ACE_TEXT (" ")); ++obuf; } textver[i] = ' '; @@ -2378,7 +2378,7 @@ ACE::format_hexdump (const char *buffer, textver[i] = 0; ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" %s\n"), + ACE_TEXT (" %s\n"), textver); } return size; @@ -2406,36 +2406,36 @@ ACE::timestamp (ACE_TCHAR date_and_time[], // below, so DO we need this ifdef. static const ACE_TCHAR *day_of_week_name[] = { - ACE_LIB_TEXT ("Sun"), - ACE_LIB_TEXT ("Mon"), - ACE_LIB_TEXT ("Tue"), - ACE_LIB_TEXT ("Wed"), - ACE_LIB_TEXT ("Thu"), - ACE_LIB_TEXT ("Fri"), - ACE_LIB_TEXT ("Sat") + ACE_TEXT ("Sun"), + ACE_TEXT ("Mon"), + ACE_TEXT ("Tue"), + ACE_TEXT ("Wed"), + ACE_TEXT ("Thu"), + ACE_TEXT ("Fri"), + ACE_TEXT ("Sat") }; static const ACE_TCHAR *month_name[] = { - ACE_LIB_TEXT ("Jan"), - ACE_LIB_TEXT ("Feb"), - ACE_LIB_TEXT ("Mar"), - ACE_LIB_TEXT ("Apr"), - ACE_LIB_TEXT ("May"), - ACE_LIB_TEXT ("Jun"), - ACE_LIB_TEXT ("Jul"), - ACE_LIB_TEXT ("Aug"), - ACE_LIB_TEXT ("Sep"), - ACE_LIB_TEXT ("Oct"), - ACE_LIB_TEXT ("Nov"), - ACE_LIB_TEXT ("Dec") + ACE_TEXT ("Jan"), + ACE_TEXT ("Feb"), + ACE_TEXT ("Mar"), + ACE_TEXT ("Apr"), + ACE_TEXT ("May"), + ACE_TEXT ("Jun"), + ACE_TEXT ("Jul"), + ACE_TEXT ("Aug"), + ACE_TEXT ("Sep"), + ACE_TEXT ("Oct"), + ACE_TEXT ("Nov"), + ACE_TEXT ("Dec") }; SYSTEMTIME local; ::GetLocalTime (&local); ACE_OS::sprintf (date_and_time, - ACE_LIB_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), + ACE_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), day_of_week_name[local.wDayOfWeek], month_name[local.wMonth - 1], (int) local.wDay, @@ -2467,9 +2467,9 @@ ACE::timestamp (ACE_TCHAR date_and_time[], 9); ACE_OS::sprintf (&date_and_time[11], # if defined (ACE_USES_WCHAR) - ACE_LIB_TEXT ("%ls %ls.%06ld"), + ACE_TEXT ("%ls %ls.%06ld"), # else - ACE_LIB_TEXT ("%s %s.%06ld"), + ACE_TEXT ("%s %s.%06ld"), # endif /* ACE_USES_WCHAR */ yeartmp, timetmp, @@ -3011,140 +3011,140 @@ ACE::sock_error (int error) switch (error) { case WSAVERNOTSUPPORTED: - return ACE_LIB_TEXT ("version of WinSock not supported"); + return ACE_TEXT ("version of WinSock not supported"); /* NOTREACHED */ case WSASYSNOTREADY: - return ACE_LIB_TEXT ("WinSock not present or not responding"); + return ACE_TEXT ("WinSock not present or not responding"); /* NOTREACHED */ case WSAEINVAL: - return ACE_LIB_TEXT ("app version not supported by DLL"); + return ACE_TEXT ("app version not supported by DLL"); /* NOTREACHED */ case WSAHOST_NOT_FOUND: - return ACE_LIB_TEXT ("Authoritive: Host not found"); + return ACE_TEXT ("Authoritive: Host not found"); /* NOTREACHED */ case WSATRY_AGAIN: - return ACE_LIB_TEXT ("Non-authoritive: host not found or server failure"); + return ACE_TEXT ("Non-authoritive: host not found or server failure"); /* NOTREACHED */ case WSANO_RECOVERY: - return ACE_LIB_TEXT ("Non-recoverable: refused or not implemented"); + return ACE_TEXT ("Non-recoverable: refused or not implemented"); /* NOTREACHED */ case WSANO_DATA: - return ACE_LIB_TEXT ("Valid name, no data record for type"); + return ACE_TEXT ("Valid name, no data record for type"); /* NOTREACHED */ /* case WSANO_ADDRESS: return "Valid name, no MX record"; */ case WSANOTINITIALISED: - return ACE_LIB_TEXT ("WSA Startup not initialized"); + return ACE_TEXT ("WSA Startup not initialized"); /* NOTREACHED */ case WSAENETDOWN: - return ACE_LIB_TEXT ("Network subsystem failed"); + return ACE_TEXT ("Network subsystem failed"); /* NOTREACHED */ case WSAEINPROGRESS: - return ACE_LIB_TEXT ("Blocking operation in progress"); + return ACE_TEXT ("Blocking operation in progress"); /* NOTREACHED */ case WSAEINTR: - return ACE_LIB_TEXT ("Blocking call cancelled"); + return ACE_TEXT ("Blocking call cancelled"); /* NOTREACHED */ case WSAEAFNOSUPPORT: - return ACE_LIB_TEXT ("address family not supported"); + return ACE_TEXT ("address family not supported"); /* NOTREACHED */ case WSAEMFILE: - return ACE_LIB_TEXT ("no file handles available"); + return ACE_TEXT ("no file handles available"); /* NOTREACHED */ case WSAENOBUFS: - return ACE_LIB_TEXT ("no buffer space available"); + return ACE_TEXT ("no buffer space available"); /* NOTREACHED */ case WSAEPROTONOSUPPORT: - return ACE_LIB_TEXT ("specified protocol not supported"); + return ACE_TEXT ("specified protocol not supported"); /* NOTREACHED */ case WSAEPROTOTYPE: - return ACE_LIB_TEXT ("protocol wrong type for this socket"); + return ACE_TEXT ("protocol wrong type for this socket"); /* NOTREACHED */ case WSAESOCKTNOSUPPORT: - return ACE_LIB_TEXT ("socket type not supported for address family"); + return ACE_TEXT ("socket type not supported for address family"); /* NOTREACHED */ case WSAENOTSOCK: - return ACE_LIB_TEXT ("handle is not a socket"); + return ACE_TEXT ("handle is not a socket"); /* NOTREACHED */ case WSAEWOULDBLOCK: - return ACE_LIB_TEXT ("resource temporarily unavailable"); + return ACE_TEXT ("resource temporarily unavailable"); /* NOTREACHED */ case WSAEADDRINUSE: - return ACE_LIB_TEXT ("address already in use"); + return ACE_TEXT ("address already in use"); /* NOTREACHED */ case WSAECONNABORTED: - return ACE_LIB_TEXT ("connection aborted"); + return ACE_TEXT ("connection aborted"); /* NOTREACHED */ case WSAECONNRESET: - return ACE_LIB_TEXT ("connection reset"); + return ACE_TEXT ("connection reset"); /* NOTREACHED */ case WSAENOTCONN: - return ACE_LIB_TEXT ("not connected"); + return ACE_TEXT ("not connected"); /* NOTREACHED */ case WSAETIMEDOUT: - return ACE_LIB_TEXT ("connection timed out"); + return ACE_TEXT ("connection timed out"); /* NOTREACHED */ case WSAECONNREFUSED: - return ACE_LIB_TEXT ("connection refused"); + return ACE_TEXT ("connection refused"); /* NOTREACHED */ case WSAEHOSTDOWN: - return ACE_LIB_TEXT ("host down"); + return ACE_TEXT ("host down"); /* NOTREACHED */ case WSAEHOSTUNREACH: - return ACE_LIB_TEXT ("host unreachable"); + return ACE_TEXT ("host unreachable"); /* NOTREACHED */ case WSAEADDRNOTAVAIL: - return ACE_LIB_TEXT ("address not available"); + return ACE_TEXT ("address not available"); /* NOTREACHED */ case WSAEISCONN: - return ACE_LIB_TEXT ("socket is already connected"); + return ACE_TEXT ("socket is already connected"); /* NOTREACHED */ case WSAENETRESET: - return ACE_LIB_TEXT ("network dropped connection on reset"); + return ACE_TEXT ("network dropped connection on reset"); /* NOTREACHED */ case WSAEMSGSIZE: - return ACE_LIB_TEXT ("message too long"); + return ACE_TEXT ("message too long"); /* NOTREACHED */ case WSAENETUNREACH: - return ACE_LIB_TEXT ("network is unreachable"); + return ACE_TEXT ("network is unreachable"); /* NOTREACHED */ case WSAEFAULT: - return ACE_LIB_TEXT ("bad address"); + return ACE_TEXT ("bad address"); /* NOTREACHED */ case WSAEDISCON: - return ACE_LIB_TEXT ("graceful shutdown in progress"); + return ACE_TEXT ("graceful shutdown in progress"); /* NOTREACHED */ case WSAEACCES: - return ACE_LIB_TEXT ("permission denied"); + return ACE_TEXT ("permission denied"); /* NOTREACHED */ case WSAESHUTDOWN: - return ACE_LIB_TEXT ("cannot send after socket shutdown"); + return ACE_TEXT ("cannot send after socket shutdown"); /* NOTREACHED */ case WSAEPROCLIM: - return ACE_LIB_TEXT ("too many processes"); + return ACE_TEXT ("too many processes"); /* NOTREACHED */ case WSAEALREADY: - return ACE_LIB_TEXT ("operation already in progress"); + return ACE_TEXT ("operation already in progress"); /* NOTREACHED */ case WSAEPFNOSUPPORT: - return ACE_LIB_TEXT ("protocol family not supported"); + return ACE_TEXT ("protocol family not supported"); /* NOTREACHED */ case WSAENOPROTOOPT: - return ACE_LIB_TEXT ("bad protocol option"); + return ACE_TEXT ("bad protocol option"); /* NOTREACHED */ case WSATYPE_NOT_FOUND: - return ACE_LIB_TEXT ("class type not found"); + return ACE_TEXT ("class type not found"); /* NOTREACHED */ case WSAEOPNOTSUPP: - return ACE_LIB_TEXT ("operation not supported"); + return ACE_TEXT ("operation not supported"); /* NOTREACHED */ case WSAEDESTADDRREQ: - return ACE_LIB_TEXT ("destination address required"); + return ACE_TEXT ("destination address required"); /* NOTREACHED */ default: - ACE_OS::sprintf (unknown_msg, ACE_LIB_TEXT ("unknown error: %d"), error); + ACE_OS::sprintf (unknown_msg, ACE_TEXT ("unknown error: %d"), error); return unknown_msg; /* NOTREACHED */ } diff --git a/ACE/ace/ACE.h b/ACE/ace/ACE.h index 8b01bd8b74c..7dec2712fa4 100644 --- a/ACE/ace/ACE.h +++ b/ACE/ace/ACE.h @@ -490,7 +490,7 @@ namespace ACE * needs to be fixed). */ extern ACE_Export pid_t fork ( - const ACE_TCHAR *program_name = ACE_LIB_TEXT ("<unknown>"), + const ACE_TCHAR *program_name = ACE_TEXT ("<unknown>"), int avoid_zombies = 0); /** @@ -500,9 +500,9 @@ namespace ACE * closed. */ extern ACE_Export int daemonize ( - const ACE_TCHAR pathname[] = ACE_LIB_TEXT ("/"), + const ACE_TCHAR pathname[] = ACE_TEXT ("/"), bool close_all_handles = ACE_DEFAULT_CLOSE_ALL_HANDLES, - const ACE_TCHAR program_name[] = ACE_LIB_TEXT ("<unknown>")); + const ACE_TCHAR program_name[] = ACE_TEXT ("<unknown>")); // = Miscellaneous functions. /// Rounds the request to a multiple of the page size. diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 354ac480b67..573cae93357 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -312,9 +312,9 @@ ACE::nibble2hex (u_int n) // loads of warnings when inlining. // problem (incorrect warning leftover from older GNU) has been reported as // TSR to Windriver. - const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); + const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); #else - static const ACE_TCHAR hex_chars[] = ACE_LIB_TEXT ("0123456789abcdef"); + static const ACE_TCHAR hex_chars[] = ACE_TEXT ("0123456789abcdef"); #endif // Yes, this works for UNICODE @@ -339,11 +339,11 @@ ACE_INLINE u_char ACE::hex2byte (ACE_TCHAR c) { if (ACE_OS::ace_isdigit (c)) - return (u_char) (c - ACE_LIB_TEXT ('0')); + return (u_char) (c - ACE_TEXT ('0')); else if (ACE_OS::ace_islower (c)) - return (u_char) (10 + c - ACE_LIB_TEXT ('a')); + return (u_char) (10 + c - ACE_TEXT ('a')); else - return (u_char) (10 + c - ACE_LIB_TEXT ('A')); + return (u_char) (10 + c - ACE_TEXT ('A')); } // Close versioned namespace, if enabled by the user. diff --git a/ACE/ace/ARGV.cpp b/ACE/ace/ARGV.cpp index 2508e88245b..431db5b0ee7 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -28,8 +28,8 @@ ACE_ARGV_Queue_Entry_T<CHAR_TYPE>::dump (void) const ACE_TRACE ("ACE_ARGV_Queue_Entry_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("arg_ = %s"), this->arg_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("arg_ = %s"), this->arg_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("quote_arg_ = %d"), (int)this->quote_arg_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -42,18 +42,18 @@ ACE_ARGV_T<CHAR_TYPE>::dump (void) const ACE_TRACE ("ACE_ARGV_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("argc_ = %d"), this->argc_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("argc_ = %d"), this->argc_)); ACE_ARGV *this_obj = const_cast<ACE_ARGV *> (this); for (int i = 0; i < this->argc_; i++) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nargv_[%i] = %s"), + ACE_TEXT ("\nargv_[%i] = %s"), i, this_obj->argv ()[i])); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nbuf = %s\n"), this->buf_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nbuf = %s\n"), this->buf_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -99,8 +99,8 @@ ACE_ARGV_T<CHAR_TYPE>::ACE_ARGV_T (const CHAR_TYPE buf[], // Create this->argv_. if (this->string_to_argv () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("string_to_argv"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("string_to_argv"))); } template <typename CHAR_TYPE> @@ -229,7 +229,7 @@ ACE_ARGV_T<CHAR_TYPE>::add (const CHAR_TYPE *next_arg, bool quote_arg) // Put the new argument at the end of the queue. if (this->queue_.enqueue_tail (ACE_ARGV_Queue_Entry_T<CHAR_TYPE> (next_arg, quote_arg)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Can't add more to ARGV queue")), + ACE_TEXT ("Can't add more to ARGV queue")), -1); ++this->argc_; diff --git a/ACE/ace/ATM_Acceptor.cpp b/ACE/ace/ATM_Acceptor.cpp index 1210917a0c5..5a78f1c32c8 100644 --- a/ACE/ace/ATM_Acceptor.cpp +++ b/ACE/ace/ATM_Acceptor.cpp @@ -76,7 +76,7 @@ ACE_ATM_Acceptor::get_local_addr (ACE_ATM_Addr &local_addr) (struct sockaddr *) & (myaddr->sockaddratmsvc), &addrlen) < 0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ATM_Acceptor (get_local_addr): ioctl: %d\n"), + ACE_TEXT ("ATM_Acceptor (get_local_addr): ioctl: %d\n"), errno)); return -1; } @@ -173,7 +173,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, )) == ACE_INVALID_HANDLE) { ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (socket): socket %d\n"), + ACE_TEXT ("Acceptor (socket): socket %d\n"), errno); return (ACE_INVALID_HANDLE); } @@ -210,7 +210,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, sizeof (local_sap_addr->sockaddratmsvc) ) == -1) { ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (open): bind %d\n"), + ACE_TEXT ("Acceptor (open): bind %d\n"), errno); return -1; } @@ -219,7 +219,7 @@ ACE_ATM_Acceptor::open (const ACE_Addr &remote_sap, backlog) == -1) { ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("Acceptor (listen): listen %d\n"), + ACE_TEXT ("Acceptor (listen): listen %d\n"), errno); return -1; } diff --git a/ACE/ace/ATM_Acceptor.inl b/ACE/ace/ATM_Acceptor.inl index b63b68a9621..545c589810a 100644 --- a/ACE/ace/ATM_Acceptor.inl +++ b/ACE/ace/ATM_Acceptor.inl @@ -23,8 +23,8 @@ ACE_ATM_Acceptor::ACE_ATM_Acceptor (const ACE_Addr &remote_sap, backlog, params) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_ATM_Acceptor::ACE_ATM_Acceptor"))); } ACE_INLINE diff --git a/ACE/ace/ATM_Addr.cpp b/ACE/ace/ATM_Addr.cpp index 1c30b7f7a9a..19088cef5b1 100644 --- a/ACE/ace/ATM_Addr.cpp +++ b/ACE/ace/ATM_Addr.cpp @@ -384,7 +384,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], atm_addr_.sap.t_atm_sap_addr.address, ATMNSAP_ADDR_LEN); ACE_OS::sprintf (buffer, - ACE_LIB_TEXT ("%s"), + ACE_TEXT ("%s"), atmnsap_ntoa (nsap)); size_t total_len = ACE_OS::strlen (buffer) + sizeof ('\0'); @@ -404,7 +404,7 @@ ACE_ATM_Addr::addr_to_string (ACE_TCHAR addr[], for (i = 0; i < ATM_ADDR_SIZE; i++) { buffer[ i * 3 ] = '\0'; - ACE_OS::sprintf (buffer, ACE_LIB_TEXT ("%s%02x."), + ACE_OS::sprintf (buffer, ACE_TEXT ("%s%02x."), buffer, atm_addr_.satm_number.Addr[ i ]); } @@ -510,9 +510,9 @@ ACE_ATM_Addr::dump (void) const ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; ACE_OS::sprintf (s, - ACE_LIB_TEXT ("%s"), + ACE_TEXT ("%s"), this->addr_to_string ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/ATM_Connector.cpp b/ACE/ace/ATM_Connector.cpp index bff8ddad5bd..ca33a2bb833 100644 --- a/ACE/ace/ATM_Connector.cpp +++ b/ACE/ace/ATM_Connector.cpp @@ -53,7 +53,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, &options.get_qos()); #elif defined (ACE_HAS_FORE_ATM_WS2) ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): set QoS parameters\n" )); + ACE_TEXT ("ATM_Connector(connect): set QoS parameters\n" )); ACE_HANDLE s = new_stream.get_handle(); struct sockaddr_atm *saddr = ( struct sockaddr_atm *)remote_sap.get_addr(); @@ -66,7 +66,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, 0); ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): connecting...\n")); + ACE_TEXT ("ATM_Connector(connect): connecting...\n")); int result = ACE_OS::connect( s, ( struct sockaddr *)saddr, @@ -103,7 +103,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, SO_ATMQOS, reinterpret_cast<char*> (&qos), sizeof(qos)) < 0) { - ACE_DEBUG((LM_DEBUG,ACE_LIB_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), + ACE_DEBUG((LM_DEBUG,ACE_TEXT ("ATM_Connector(connect): unable to set qos %d\n"), errno)); return -1; } @@ -114,7 +114,7 @@ ACE_ATM_Connector::connect (ACE_ATM_Stream &new_stream, if ( result != 0 ) ACE_DEBUG(LM_DEBUG, - ACE_LIB_TEXT ("ATM_Connector(connect): connection failed, %d\n"), + ACE_TEXT ("ATM_Connector(connect): connection failed, %d\n"), errno); return result; diff --git a/ACE/ace/ATM_Connector.inl b/ACE/ace/ATM_Connector.inl index f301aa781f5..b9372ccb34d 100644 --- a/ACE/ace/ATM_Connector.inl +++ b/ACE/ace/ATM_Connector.inl @@ -35,8 +35,8 @@ ACE_ATM_Connector::ACE_ATM_Connector (ACE_ATM_Stream &new_stream, flags, perms) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_ATM_Stream::ACE_ATM_Stream"))); } // Try to complete a non-blocking connection. diff --git a/ACE/ace/ATM_QoS.cpp b/ACE/ace/ATM_QoS.cpp index 814834571cf..6a7e6d4f463 100644 --- a/ACE/ace/ATM_QoS.cpp +++ b/ACE/ace/ATM_QoS.cpp @@ -118,7 +118,7 @@ ACE_ATM_QoS::ACE_ATM_QoS(int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), + ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; } @@ -298,7 +298,7 @@ ACE_ATM_QoS::set_cbr_rate (int rate, qos_.ProviderSpecific.buf = (char *) ACE_OS::malloc(size); if (qos_.ProviderSpecific.buf == 0) { ACE_ERROR((LM_ERROR, - ACE_LIB_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), + ACE_TEXT ("ACE_ATM_QoS::ACE_ATM_QoS: Unable to allocate %d bytes for qos_.ProviderSpecific.buf\n"), size)); return; } @@ -468,7 +468,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, if (buf == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unable to allocate %d bytes for options\n"), + ACE_TEXT ("Unable to allocate %d bytes for options\n"), info.options), 0); @@ -504,7 +504,7 @@ ACE_ATM_QoS::construct_options (ACE_HANDLE fd, { ACE_OS::t_error("t_getname (local_address)"); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Can't get local address!\n"))); + ACE_TEXT ("Can't get local address!\n"))); ACE_OS::free (buf); return 0; } diff --git a/ACE/ace/ATM_Stream.cpp b/ACE/ace/ATM_Stream.cpp index c6de5d4b533..8cbc909a44d 100644 --- a/ACE/ace/ATM_Stream.cpp +++ b/ACE/ace/ATM_Stream.cpp @@ -118,7 +118,7 @@ ACE_ATM_Stream::get_peer_name (void) const if ((total_len = atm2text (buffer,sizeof buffer, (struct sockaddr *) & (name.sockaddratmsvc), A2T_PRETTY|A2T_NAME)) < 0) { - ACE_DEBUG ((LM_DEBUG,ACE_LIB_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); + ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("ACE_ATM_Stream (get_peer_name) :%d"),errno)); return 0; } @@ -248,7 +248,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, reinterpret_cast<char*> (&mypvcaddr), &addrpvclen) < 0) { ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), + ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; } @@ -264,7 +264,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, reinterpret_cast<char*> (&mypvcid), &pvcidlen) < 0) { ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), + ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: getsockopt %d\n"), errno); return -1; } @@ -274,7 +274,7 @@ ACE_ATM_Stream::get_vpi_vci (ACE_UINT16 &vpi, return 0; #else ACE_DEBUG (LM_DEBUG, - ACE_LIB_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); + ACE_TEXT ("ACE_ATM_Stream::get_vpi_vci: Not implemented in this ATM version. Update to >= 0.62\n Or patch 0.59")); ACE_UNUSED_ARG (vci); ACE_UNUSED_ARG (vpi); diff --git a/ACE/ace/Acceptor.cpp b/ACE/ace/Acceptor.cpp index 16755b336cf..d43e3a55bae 100644 --- a/ACE/ace/Acceptor.cpp +++ b/ACE/ace/Acceptor.cpp @@ -136,8 +136,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Acceptor use_select, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Acceptor::ACE_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Acceptor::ACE_Acceptor"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> @@ -178,10 +178,10 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return -1; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s %s"), - ACE_LIB_TEXT ("ACE_Acceptor"), + ACE_TEXT ("%s\t %s %s"), + ACE_TEXT ("ACE_Acceptor"), addr_str, - ACE_LIB_TEXT ("# acceptor factory\n")); + ACE_TEXT ("# acceptor factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -233,7 +233,7 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE, // Shut down the listen socket to recycle the handles. if (this->peer_acceptor_.close () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close\n"))); + ACE_TEXT ("close\n"))); // Set the Reactor to 0 so that we don't try to close down // again. this->reactor (0); @@ -384,8 +384,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("make_svc_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("make_svc_handler"))); return 0; } // Accept connection into the Svc_Handler. @@ -395,8 +395,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene // on failure. if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("accept_svc_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("accept_svc_handler"))); return 0; } // Activate the <svc_handler> using the designated concurrency @@ -410,8 +410,8 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("activate_svc_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("activate_svc_handler"))); return 0; } @@ -464,17 +464,17 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (); this->creation_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_creation_strategy_ = %d"), delete_creation_strategy_)); this->accept_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_accept_strategy_ = %d"), delete_accept_strategy_)); this->concurrency_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->scheduling_strategy_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nservice_name_ = %s"), - this->service_name_ == 0 ? ACE_LIB_TEXT ("<unknown>") : this->service_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nservice_description_ = %s"), - this->service_description_ == 0 ? ACE_LIB_TEXT ("<unknown>") : this->service_description_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_scheduling_strategy_ = %d"), delete_scheduling_strategy_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_name_ = %s"), + this->service_name_ == 0 ? ACE_TEXT ("<unknown>") : this->service_name_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nservice_description_ = %s"), + this->service_description_ == 0 ? ACE_TEXT ("<unknown>") : this->service_description_)); this->service_addr_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -683,8 +683,8 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Strategy_Acceptor use_select, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Strategy_Acceptor::ACE_Strategy_Acceptor"))); } // Perform termination activities when <this> is removed from the @@ -815,13 +815,13 @@ ACE_Strategy_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, // @@ Should add the protocol in... ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s #%s\n"), + ACE_TEXT ("%s\t %s #%s\n"), this->service_name_ == 0 - ? ACE_LIB_TEXT ("<unknown>") + ? ACE_TEXT ("<unknown>") : this->service_name_, service_addr_str, this->service_description_ == 0 - ? ACE_LIB_TEXT ("<unknown>") + ? ACE_TEXT ("<unknown>") : this->service_description_); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -847,10 +847,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump (void) const ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsvc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d"), this->restart_)); this->peer_acceptor_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_concurrency_strategy_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_concurrency_strategy_ = %d"), delete_concurrency_strategy_)); this->concurrency_strategy_->dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -899,8 +899,8 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor ACE_TRACE ("ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Oneshot_Acceptor"); if (this->open (local_addr, reactor, cs) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Oneshot_Acceptor::ACE_Oneshot_Acceptor"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> @@ -940,7 +940,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_close (ACE_HANDLE if (this->peer_acceptor_.close () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close\n"))); + ACE_TEXT ("close\n"))); return 0; } @@ -1172,10 +1172,10 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::info (ACE_TCHAR **strp, return -1; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s %s"), - ACE_LIB_TEXT ("ACE_Oneshot_Acceptor"), + ACE_TEXT ("%s\t %s %s"), + ACE_TEXT ("ACE_Oneshot_Acceptor"), addr_str, - ACE_LIB_TEXT ("#oneshot acceptor factory\n")); + ACE_TEXT ("#oneshot acceptor factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; diff --git a/ACE/ace/Activation_Queue.cpp b/ACE/ace/Activation_Queue.cpp index a5f3e694107..aef17d05e7a 100644 --- a/ACE/ace/Activation_Queue.cpp +++ b/ACE/ace/Activation_Queue.cpp @@ -21,14 +21,14 @@ ACE_Activation_Queue::dump (void) const #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("delete_queue_ = %d\n"), + ACE_TEXT ("delete_queue_ = %d\n"), this->delete_queue_)); - ACE_DEBUG ((LM_INFO, ACE_LIB_TEXT ("queue_: \n"))); + ACE_DEBUG ((LM_INFO, ACE_TEXT ("queue_: \n"))); if (this->queue_) this->queue_->dump(); else //FUZZ: disable check_for_NULL - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(NULL)\n"))); //FUZZ: enable check_for_NULL ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ACE/ace/Addr.cpp b/ACE/ace/Addr.cpp index 7961afb0099..f458e018eef 100644 --- a/ACE/ace/Addr.cpp +++ b/ACE/ace/Addr.cpp @@ -64,8 +64,8 @@ ACE_Addr::dump (void) const ACE_TRACE ("ACE_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("addr_type_ = %d"), this->addr_type_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\naddr_size_ = %d"), this->addr_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("addr_type_ = %d"), this->addr_type_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\naddr_size_ = %d"), this->addr_size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Arg_Shifter.cpp b/ACE/ace/Arg_Shifter.cpp index 65c32817878..36c265c6d5a 100644 --- a/ACE/ace/Arg_Shifter.cpp +++ b/ACE/ace/Arg_Shifter.cpp @@ -144,7 +144,7 @@ ACE_Arg_Shifter_T<CHAR_TYPE>::cur_arg_strncasecmp (const CHAR_TYPE *flag) // matches, with more info to boot! size_t const remaining = ACE_OS::strspn (this->temp_[current_index_] + flag_length, - ACE_LIB_TEXT (" ")) + flag_length; + ACE_TEXT (" ")) + flag_length; return static_cast<int> (remaining); } } diff --git a/ACE/ace/Assert.cpp b/ACE/ace/Assert.cpp index c46d30793ab..20ef735ba40 100644 --- a/ACE/ace/Assert.cpp +++ b/ACE/ace/Assert.cpp @@ -17,8 +17,8 @@ __ace_assert(const char *file, int line, const ACE_TCHAR *expression) log->set (file, line, -1, error, log->restart (), log->msg_ostream (), log->msg_callback ()); - - log->log (LM_ERROR, ACE_LIB_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), expression, -1); + + log->log (LM_ERROR, ACE_TEXT ("ACE_ASSERT: file %N, line %l assertion failed for '%s'.%a\n"), expression, -1); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Asynch_Acceptor.cpp b/ACE/ace/Asynch_Acceptor.cpp index fd7525a30c8..e1e7f054343 100644 --- a/ACE/ace/Asynch_Acceptor.cpp +++ b/ACE/ace/Asynch_Acceptor.cpp @@ -71,8 +71,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, this->listen_handle_ = ACE_OS::socket (address.get_type (), SOCK_STREAM, 0); if (this->listen_handle_ == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::socket")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::socket")), -1); // Initialize the ACE_Asynch_Accept if (this->asynch_accept_.open (*this, @@ -82,8 +82,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Accept::open"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Accept::open"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -101,8 +101,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::setsockopt"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::setsockopt"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -119,8 +119,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::bind_port"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::bind_port"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -133,8 +133,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::bind"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::bind"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -145,8 +145,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::listen"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::listen"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -163,8 +163,8 @@ ACE_Asynch_Acceptor<HANDLER>::open (const ACE_INET_Addr &address, { ACE_Errno_Guard g (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Acceptor::accept"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Acceptor::accept"))); ACE_OS::closesocket (this->listen_handle_); this->listen_handle_ = ACE_INVALID_HANDLE; return -1; @@ -188,8 +188,8 @@ ACE_Asynch_Acceptor<HANDLER>::set_handle (ACE_HANDLE listen_handle) 0, this->proactor ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Accept::open")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Accept::open")), -1); return 0; } diff --git a/ACE/ace/Asynch_Connector.cpp b/ACE/ace/Asynch_Connector.cpp index 65b23f9a60c..cf368e68947 100644 --- a/ACE/ace/Asynch_Connector.cpp +++ b/ACE/ace/Asynch_Connector.cpp @@ -49,8 +49,8 @@ ACE_Asynch_Connector<HANDLER>::open (int pass_addresses, 0, this->proactor ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connect::open")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Connect::open")), -1); return 0; } @@ -68,8 +68,8 @@ ACE_Asynch_Connector<HANDLER>::connect (const ACE_INET_Addr & remote_sap, reuse_addr, act) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connect::connect")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Connect::connect")), -1); return 0; } @@ -99,8 +99,8 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result { error = 1; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connector::handle_connect : Set blocking mode"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Set blocking mode"))); } // Parse the addresses. @@ -129,8 +129,8 @@ ACE_Asynch_Connector<HANDLER>::handle_connect (const ACE_Asynch_Connect::Result { error = 1; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Asynch_Connector::handle_connect : Making of new handler failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Asynch_Connector::handle_connect : Making of new handler failed"))); } } @@ -204,16 +204,16 @@ ACE_Asynch_Connector<HANDLER>::parse_address (const ACE_Asynch_Connect::Result & reinterpret_cast<sockaddr *> (&local_addr), &local_size) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("ACE_Asynch_Connector::<getsockname> failed"))); + ACE_TEXT("%p\n"), + ACE_TEXT("ACE_Asynch_Connector::<getsockname> failed"))); // Get the remote address. if (ACE_OS::getpeername (result.connect_handle (), reinterpret_cast<sockaddr *> (&remote_addr), &remote_size) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%p\n"), - ACE_LIB_TEXT("ACE_Asynch_Connector::<getpeername> failed"))); + ACE_TEXT("%p\n"), + ACE_TEXT("ACE_Asynch_Connector::<getpeername> failed"))); // Set the addresses. local_address.set (reinterpret_cast<sockaddr_in *> (&local_addr), diff --git a/ACE/ace/Asynch_Pseudo_Task.cpp b/ACE/ace/Asynch_Pseudo_Task.cpp index b9dd61a1f5f..6bc47866b6f 100644 --- a/ACE/ace/Asynch_Pseudo_Task.cpp +++ b/ACE/ace/Asynch_Pseudo_Task.cpp @@ -25,8 +25,8 @@ ACE_Asynch_Pseudo_Task::start (void) { if (this->reactor_.initialized () == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("start reactor is not initialized")), + ACE_TEXT ("%N:%l:%p\n"), + ACE_TEXT ("start reactor is not initialized")), -1); return this->activate () == -1 ? -1 : 0; // If started, return 0 @@ -59,8 +59,8 @@ ACE_Asynch_Pseudo_Task::svc (void) if (ACE_OS::pthread_sigmask (SIG_BLOCK, &RT_signals, 0) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT ("pthread_sigmask"))); + ACE_TEXT ("Error:(%P | %t):%p\n"), + ACE_TEXT ("pthread_sigmask"))); #endif reactor_.owner (ACE_Thread::self ()); @@ -90,8 +90,8 @@ ACE_Asynch_Pseudo_Task::register_io_handler (ACE_HANDLE handle, { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("register_io_handler (suspended)"))); + ACE_TEXT ("%N:%l:%p\n"), + ACE_TEXT ("register_io_handler (suspended)"))); this->reactor_.remove_handler (handle, ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL); return -1; diff --git a/ACE/ace/Barrier.cpp b/ACE/ace/Barrier.cpp index 739e249cd76..2cb82dba5b6 100644 --- a/ACE/ace/Barrier.cpp +++ b/ACE/ace/Barrier.cpp @@ -31,8 +31,8 @@ ACE_Sub_Barrier::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->barrier_finished_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("running_threads_ = %d"), this->running_threads_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("running_threads_ = %d"), this->running_threads_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -57,8 +57,8 @@ ACE_Barrier::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_generation_ = %d"), this->current_generation_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncount_ = %d"), this->count_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_generation_ = %d"), this->current_generation_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncount_ = %d"), this->count_)); this->sub_barrier_1_.dump (); this->sub_barrier_2_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ACE/ace/Based_Pointer_T.cpp b/ACE/ace/Based_Pointer_T.cpp index 2155bc3a734..217e1634690 100644 --- a/ACE/ace/Based_Pointer_T.cpp +++ b/ACE/ace/Based_Pointer_T.cpp @@ -7,7 +7,7 @@ #include "ace/Based_Pointer_Repository.h" #include "ace/Log_Msg.h" -# define ACE_TRACEX(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) +# define ACE_TRACEX(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__)) #if !defined (__ACE_INLINE__) #include "ace/Based_Pointer_T.inl" @@ -28,9 +28,9 @@ ACE_Based_Pointer_Basic<CONCRETE>::dump (void) const ACE_TRACE ("ACE_Based_Pointer_Basic<CONCRETE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntarget_ = %d\n"), this->target_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_offset_ = %d\n"), this->base_offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("computed pointer = %x\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntarget_ = %d\n"), this->target_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_offset_ = %d\n"), this->base_offset_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("computed pointer = %x\n"), (CONCRETE *)(ACE_COMPUTE_BASED_POINTER (this)))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Basic_Stats.cpp b/ACE/ace/Basic_Stats.cpp index cfe8ca320b0..9c0b2a7c2f5 100644 --- a/ACE/ace/Basic_Stats.cpp +++ b/ACE/ace/Basic_Stats.cpp @@ -52,7 +52,7 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const if (this->samples_count () == 0u) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s : no data collected\n"), msg)); + ACE_TEXT ("%s : no data collected\n"), msg)); return; } @@ -63,7 +63,7 @@ ACE_Basic_Stats::dump_results (const ACE_TCHAR *msg, ACE_UINT32 sf) const ACE_UINT64 l_avg = avg / sf; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s latency : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"), + ACE_TEXT ("%s latency : %Q[%d]/%Q/%Q[%d] (min/avg/max)\n"), msg, l_min, this->min_at_, l_avg, diff --git a/ACE/ace/Basic_Types.cpp b/ACE/ace/Basic_Types.cpp index ec2f73823e0..f2e055b991e 100644 --- a/ACE/ace/Basic_Types.cpp +++ b/ACE/ace/Basic_Types.cpp @@ -102,7 +102,7 @@ ACE_U_LongLong::as_string (ACE_TCHAR *output, default: { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Unsupported base = %u\n"), base)); + ACE_TEXT ("Unsupported base = %u\n"), base)); output[0] = '\0'; } } diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 837ebaaa368..2d6942bb511 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -706,89 +706,89 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if !defined (ACE_INT8_FORMAT_SPECIFIER) # if defined (PRId8) -# define ACE_INT8_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRId8) +# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId8) # else -# define ACE_INT8_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%d") # endif /* defined (PRId8) */ #endif /* ACE_INT8_FORMAT_SPECIFIER */ #if !defined (ACE_UINT8_FORMAT_SPECIFIER) # if defined (PRIu8) -# define ACE_UINT8_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu8) +# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu8) # else -# define ACE_UINT8_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%u") # endif /* defined (PRIu8) */ #endif /* ACE_UINT8_FORMAT_SPECIFIER */ #if !defined (ACE_INT16_FORMAT_SPECIFIER) # if defined (PRId16) -# define ACE_INT16_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRId16) +# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId16) # else -# define ACE_INT16_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%d") # endif /* defined (PRId16) */ #endif /* ACE_INT16_FORMAT_SPECIFIER */ #if !defined (ACE_UINT16_FORMAT_SPECIFIER) # if defined (PRIu16) -# define ACE_UINT16_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu16) +# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu16) # else -# define ACE_UINT16_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%u") # endif /* defined (PRIu16) */ #endif /* ACE_UINT16_FORMAT_SPECIFIER */ #if !defined (ACE_INT32_FORMAT_SPECIFIER) # if defined (PRId32) -# define ACE_INT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRId32) +# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId32) # elif ACE_SIZEOF_INT == 4 -# define ACE_INT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%d") # else -# define ACE_INT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") +# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%ld") # endif /* defined (PRId32) */ #endif /* ACE_INT32_FORMAT_SPECIFIER */ #if !defined (ACE_UINT32_FORMAT_SPECIFIER) # if defined (PRIu32) -# define ACE_UINT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu32) +# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu32) # elif ACE_SIZEOF_INT == 4 -# define ACE_UINT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%u") # else -# define ACE_UINT32_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%lu") # endif /* defined (PRIu32) */ #endif /* ACE_UINT32_FORMAT_SPECIFIER */ #if !defined (ACE_INT64_FORMAT_SPECIFIER) # if defined (PRId64) -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRId64) +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId64) # elif ACE_SIZEOF_LONG == 8 -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%ld") # else -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%lld") # endif /* defined (PRId64) */ #endif /* ACE_INT64_FORMAT_SPECIFIER */ #if !defined (ACE_UINT64_FORMAT_SPECIFIER) # if defined (PRIu64) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%") ACE_LIB_TEXT (PRIu64) +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu64) # elif ACE_SIZEOF_LONG == 8 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") # else -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%llu") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%llu") # endif /* defined (PRIu64) */ #endif /* ACE_UINT64_FORMAT_SPECIFIER */ #if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64d") # else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%d") # endif /* ACE_WIN64 */ #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ #if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) # if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64u") # else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%u") +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%u") # endif /* ACE_WIN64 */ #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ diff --git a/ACE/ace/CE_Screen_Output.cpp b/ACE/ace/CE_Screen_Output.cpp index 3afc5325d9a..800cc1c0926 100644 --- a/ACE/ace/CE_Screen_Output.cpp +++ b/ACE/ace/CE_Screen_Output.cpp @@ -29,7 +29,7 @@ ACE_CE_Screen_Output::~ACE_CE_Screen_Output() void ACE_CE_Screen_Output::log(ACE_Log_Record &log_record) { ACE_TCHAR verbose_msg[ACE_Log_Record::MAXVERBOSELOGMSGLEN]; - int result = log_record.format_msg (ACE_LIB_TEXT("WindozeCE"), // host name + int result = log_record.format_msg (ACE_TEXT("WindozeCE"), // host name 0, // verbose flag verbose_msg); @@ -102,7 +102,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned char output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output) { ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%u"), output); + wsprintf(buffer, ACE_TEXT("%u"), output); *this << buffer; return *this; } @@ -110,7 +110,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned short output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output) { ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%d"), output); + wsprintf(buffer, ACE_TEXT("%d"), output); *this << buffer; return *this; } @@ -118,7 +118,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (int output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output) { ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%du"), output); + wsprintf(buffer, ACE_TEXT("%du"), output); *this << buffer; return *this; } @@ -126,7 +126,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned int output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output) { ACE_TCHAR buffer[20]; - swprintf(buffer, ACE_LIB_TEXT("%f"), output); + swprintf(buffer, ACE_TEXT("%f"), output); *this << buffer; return *this; } @@ -134,7 +134,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (float output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output) { ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%l"), output); + wsprintf(buffer, ACE_TEXT("%l"), output); *this << buffer; return *this; } @@ -142,7 +142,7 @@ ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (long output) ACE_CE_Screen_Output& ACE_CE_Screen_Output::operator << (unsigned long output) { ACE_TCHAR buffer[20]; - wsprintf(buffer, ACE_LIB_TEXT("%lu"), output); + wsprintf(buffer, ACE_TEXT("%lu"), output); *this << buffer; return *this; } diff --git a/ACE/ace/CE_Screen_Output.h b/ACE/ace/CE_Screen_Output.h index c97b0e90e2c..e3ca13de295 100644 --- a/ACE/ace/CE_Screen_Output.h +++ b/ACE/ace/CE_Screen_Output.h @@ -26,8 +26,8 @@ namespace { - const ACE_TCHAR endl[] = ACE_LIB_TEXT("\r\n"); - const ACE_TCHAR tab[] = ACE_LIB_TEXT("\t"); + const ACE_TCHAR endl[] = ACE_TEXT("\r\n"); + const ACE_TCHAR tab[] = ACE_TEXT("\t"); } ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Cache_Map_Manager_T.cpp b/ACE/ace/Cache_Map_Manager_T.cpp index effa6f7d208..b2526fcfa99 100644 --- a/ACE/ace/Cache_Map_Manager_T.cpp +++ b/ACE/ace/Cache_Map_Manager_T.cpp @@ -35,8 +35,8 @@ ACE_Cache_Map_Manager<ACE_T2>::ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_ { if (this->open (size, alloc) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Cache_Map_Manager::ACE_Cache_Map_Manager"))); } diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp index 9906cd0a2f5..5c4720b2085 100644 --- a/ACE/ace/Cached_Connect_Strategy_T.cpp +++ b/ACE/ace/Cached_Connect_Strategy_T.cpp @@ -34,8 +34,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::ACE_Cached_Connect_Strategy_Ex { if (this->open (cre_s, con_s, rec_s) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Cached_Connect_Strategy_Ex<ACE_T2>\n"))); } template <ACE_T1> @@ -645,9 +645,9 @@ ACE_Bounded_Cached_Connect_Strategy<ACE_T2>::find_or_create_svc_handler_i ACE_ASSERT (0); // just to see it coming ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%t)ACE_Bounded_Cached_Connect_Strategy<>::") - ACE_LIB_TEXT ("find_or_create_svc_handler_i - ") - ACE_LIB_TEXT ("error polling server socket state.\n"))); + ACE_TEXT ("(%t)ACE_Bounded_Cached_Connect_Strategy<>::") + ACE_TEXT ("find_or_create_svc_handler_i - ") + ACE_TEXT ("error polling server socket state.\n"))); return -1; } diff --git a/ACE/ace/Caching_Strategies_T.inl b/ACE/ace/Caching_Strategies_T.inl index d846b66b13a..f5ea93858ed 100644 --- a/ACE/ace/Caching_Strategies_T.inl +++ b/ACE/ace/Caching_Strategies_T.inl @@ -199,7 +199,7 @@ ACE_LRU_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const ACE_TRACE ("ACE_LRU_Caching_Strategy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("timer_ = %d "), this->timer_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("timer_ = %d "), this->timer_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -364,7 +364,7 @@ ACE_FIFO_Caching_Strategy<ATTRIBUTES, CACHING_UTILITY>::dump (void) const ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("order_ = %d "), this->order_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("order_ = %d "), this->order_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Capabilities.cpp b/ACE/ace/Capabilities.cpp index 0e8cf753871..04587194a77 100644 --- a/ACE/ace/Capabilities.cpp +++ b/ACE/ace/Capabilities.cpp @@ -35,36 +35,36 @@ ACE_Capabilities::~ACE_Capabilities (void) const ACE_TCHAR * ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap) { - while (*buf != ACE_LIB_TEXT ('\0') && *buf != ACE_LIB_TEXT (',')) + while (*buf != ACE_TEXT ('\0') && *buf != ACE_TEXT (',')) { - if (*buf == ACE_LIB_TEXT ('\\')) + if (*buf == ACE_TEXT ('\\')) { ++buf; - if (*buf == ACE_LIB_TEXT ('E') || *buf == ACE_LIB_TEXT ('e')) + if (*buf == ACE_TEXT ('E') || *buf == ACE_TEXT ('e')) { cap += ACE_ESC; ++buf; continue; } - else if (*buf == ACE_LIB_TEXT ('r')) + else if (*buf == ACE_TEXT ('r')) { - cap += ACE_LIB_TEXT ('\r'); + cap += ACE_TEXT ('\r'); ++buf; continue; } - else if (*buf == ACE_LIB_TEXT ('n')) + else if (*buf == ACE_TEXT ('n')) { - cap += ACE_LIB_TEXT ('\n'); + cap += ACE_TEXT ('\n'); ++buf; continue; } - else if (*buf == ACE_LIB_TEXT ('t')) + else if (*buf == ACE_TEXT ('t')) { - cap += ACE_LIB_TEXT ('\t'); + cap += ACE_TEXT ('\t'); ++buf; continue; } - else if (*buf == ACE_LIB_TEXT ('\\')) + else if (*buf == ACE_TEXT ('\\')) { cap += *buf++; continue; @@ -76,7 +76,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, ACE_TString &cap) for (int i = 0; i < 3 && *buf && ACE_OS::ace_isdigit (*buf); i++) - oc = oc * 8 + (*buf++ - ACE_LIB_TEXT ('0')); + oc = oc * 8 + (*buf++ - ACE_TEXT ('0')); cap += (ACE_TCHAR) oc; continue; @@ -93,7 +93,7 @@ ACE_Capabilities::parse (const ACE_TCHAR *buf, int &cap) int n = 0; while (*buf && ACE_OS::ace_isdigit (*buf)) - n = n * 10 + (*buf++ - ACE_LIB_TEXT ('0')); + n = n * 10 + (*buf++ - ACE_TEXT ('0')); cap = n; @@ -131,26 +131,26 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) while (*buf && ACE_OS::ace_isspace(*buf)) buf++; // If we get end of line return - if (*buf == ACE_LIB_TEXT ('\0')) + if (*buf == ACE_TEXT ('\0')) break; - if (*buf == ACE_LIB_TEXT ('#')) + if (*buf == ACE_TEXT ('#')) { - while (*buf && *buf != ACE_LIB_TEXT ('\n')) + while (*buf && *buf != ACE_TEXT ('\n')) buf++; - if (*buf == ACE_LIB_TEXT ('\n')) + if (*buf == ACE_TEXT ('\n')) buf++; continue; } - while(*buf && *buf != ACE_LIB_TEXT ('=') - && *buf!= ACE_LIB_TEXT ('#') - && *buf != ACE_LIB_TEXT (',')) + while(*buf && *buf != ACE_TEXT ('=') + && *buf!= ACE_TEXT ('#') + && *buf != ACE_TEXT (',')) name += *buf++; // If name is null. switch (*buf) { - case ACE_LIB_TEXT ('='): + case ACE_TEXT ('='): // String property buf = this->parse (buf + 1, s); ACE_NEW_RETURN (ce, @@ -162,7 +162,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return -1; } break; - case ACE_LIB_TEXT ('#'): + case ACE_TEXT ('#'): // Integer property buf = this->parse (buf + 1, n); ACE_NEW_RETURN (ce, @@ -174,7 +174,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return -1; } break; - case ACE_LIB_TEXT (','): + case ACE_TEXT (','): // Boolean ACE_NEW_RETURN (ce, ACE_BoolCapEntry (1), @@ -189,7 +189,7 @@ ACE_Capabilities::fillent (const ACE_TCHAR *buf) return 0; } - if (*buf++ != ACE_LIB_TEXT (',')) + if (*buf++ != ACE_TEXT (',')) return -1; } @@ -206,12 +206,12 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) ++line; // End of line reached - if (*line == ACE_LIB_TEXT ('\0')) + if (*line == ACE_TEXT ('\0')) break; // Build the entry name ACE_TString nextname; - while (*line && *line != ACE_LIB_TEXT ('|') && *line != ACE_LIB_TEXT (',')) + while (*line && *line != ACE_TEXT ('|') && *line != ACE_TEXT (',')) nextname += *line++; // We have found the required entry? @@ -219,12 +219,12 @@ ACE_Capabilities::is_entry (const ACE_TCHAR *name, const ACE_TCHAR *line) return 1; // Skip puntuaction char if neccesary. - if (*line == ACE_LIB_TEXT ('|') || *line == ACE_LIB_TEXT (',')) + if (*line == ACE_TEXT ('|') || *line == ACE_TEXT (',')) ++line; else { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Invalid entry\n"))); + ACE_TEXT ("Invalid entry\n"))); break; } } @@ -238,7 +238,7 @@ ACE_Capabilities::getline (FILE *fp, ACE_TString &line) line.set (0, 0); - while ((ch = ACE_OS::fgetc (fp)) != EOF && ch != ACE_LIB_TEXT ('\n')) + while ((ch = ACE_OS::fgetc (fp)) != EOF && ch != ACE_TEXT ('\n')) line += (ACE_TCHAR) ch; if (ch == EOF && line.length () == 0) @@ -295,7 +295,7 @@ is_empty (const ACE_TCHAR *line) while (*line && ACE_OS::ace_isspace (*line)) ++line; - return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); + return *line == ACE_TEXT ('\0') || *line == ACE_TEXT ('#'); } static int @@ -304,18 +304,18 @@ is_line (const ACE_TCHAR *line) while (*line && ACE_OS::ace_isspace (*line)) ++line; - return *line != ACE_LIB_TEXT ('\0'); + return *line != ACE_TEXT ('\0'); } #endif /* !ACE_IS_SPLITTING */ int ACE_Capabilities::getent (const ACE_TCHAR *fname, const ACE_TCHAR *name) { - FILE *fp = ACE_OS::fopen (fname, ACE_LIB_TEXT ("r")); + FILE *fp = ACE_OS::fopen (fname, ACE_TEXT ("r")); if (fp == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Can't open %s file\n"), + ACE_TEXT ("Can't open %s file\n"), fname), -1); diff --git a/ACE/ace/Capabilities.h b/ACE/ace/Capabilities.h index f4183f22986..4c26b9cb83a 100644 --- a/ACE/ace/Capabilities.h +++ b/ACE/ace/Capabilities.h @@ -198,7 +198,7 @@ is_empty (const ACE_TCHAR *line) while (*line && ACE_OS::ace_isspace (*line)) ++line; - return *line == ACE_LIB_TEXT ('\0') || *line == ACE_LIB_TEXT ('#'); + return *line == ACE_TEXT ('\0') || *line == ACE_TEXT ('#'); } int @@ -207,7 +207,7 @@ is_line (const ACE_TCHAR *line) while (*line && ACE_OS::ace_isspace (*line)) ++line; - return *line != ACE_LIB_TEXT ('\0'); + return *line != ACE_TEXT ('\0'); } #endif /* ACE_IS_SPLITTING */ diff --git a/ACE/ace/Codecs.cpp b/ACE/ace/Codecs.cpp index 78f61aa6394..4e8dbd5106e 100644 --- a/ACE/ace/Codecs.cpp +++ b/ACE/ace/Codecs.cpp @@ -175,7 +175,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) if (char_count) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), + ACE_TEXT ("Decoding incomplete: atleast %d bits truncated\n"), (4 - char_count) * 6)); ++errors; } @@ -186,7 +186,7 @@ ACE_Base64::decode (const ACE_Byte* input, size_t* output_len) { case 1: ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); + ACE_TEXT ("Decoding incomplete: atleast 2 bits missing\n"))); ++errors; break; case 2: diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp index 06301818247..af80f4bfbfd 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp @@ -36,7 +36,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::dump (void) const // No dump method for ACE_cond_t even in emulated mode. // cond_.dump (); this->mutex_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp index df125ee0816..fa0dab4e80a 100644 --- a/ACE/ace/Condition_T.cpp +++ b/ACE/ace/Condition_T.cpp @@ -28,7 +28,7 @@ ACE_Condition<MUTEX>::dump (void) const // ACE_TRACE ("ACE_Condition<MUTEX>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -67,8 +67,8 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition::ACE_Condition"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Condition::ACE_Condition"))); } template <class MUTEX> @@ -78,8 +78,8 @@ ACE_Condition<MUTEX>::~ACE_Condition (void) if (this->remove () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition::~ACE_Condition"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Condition::~ACE_Condition"))); } template <class MUTEX> int diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp index aec41113b80..1535b4c87f3 100644 --- a/ACE/ace/Condition_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Thread_Mutex.cpp @@ -32,10 +32,10 @@ ACE_Condition_Thread_Mutex::dump (void) const // ACE_TRACE ("ACE_Condition_Thread_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); #if defined (ACE_WIN32) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("waiters = %d\n"), + ACE_TEXT ("waiters = %d\n"), this->cond_.waiters ())); #endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -54,8 +54,8 @@ ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex (ACE_Thread_Mutex &m, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); } ACE_Condition_Thread_Mutex:: @@ -69,8 +69,8 @@ ACE_Condition_Thread_Mutex (ACE_Thread_Mutex &m, // ACE_TRACE ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"); if (ACE_OS::cond_init (&this->cond_, attributes.attributes_, name, arg) != 0) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Condition_Thread_Mutex::ACE_Condition_Thread_Mutex"))); } ACE_Condition_Thread_Mutex::~ACE_Condition_Thread_Mutex (void) diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 791d80da057..15c782c6369 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -151,20 +151,20 @@ ACE_Configuration::validate_name (const ACE_TCHAR* name, int allow_path) { // Invalid character set const ACE_TCHAR* reject = - allow_path ? ACE_LIB_TEXT ("][") : ACE_LIB_TEXT ("\\]["); + allow_path ? ACE_TEXT ("][") : ACE_TEXT ("\\]["); // Position of the first invalid character or terminating null. size_t pos = ACE_OS::strcspn (name, reject); // Check if it is an invalid character. - if (name[pos] != ACE_LIB_TEXT ('\0')) + if (name[pos] != ACE_TEXT ('\0')) { errno = EINVAL; return -1; } // The first character can never be a path separator. - if (name[0] == ACE_LIB_TEXT ('\\')) + if (name[0] == ACE_TEXT ('\\')) { errno = EINVAL; return -1; @@ -1254,7 +1254,7 @@ ACE_Configuration_Heap::ACE_Configuration_Heap (void) { ACE_Configuration_Section_Key_Heap *temp = 0; - ACE_NEW (temp, ACE_Configuration_Section_Key_Heap (ACE_LIB_TEXT (""))); + ACE_NEW (temp, ACE_Configuration_Section_Key_Heap (ACE_TEXT (""))); root_ = ACE_Configuration_Section_Key (temp); } @@ -1308,7 +1308,7 @@ ACE_Configuration_Heap::open (const ACE_TCHAR* file_name, // Now check if the backing store has been created successfully. if (ACE_OS::access (file_name, F_OK) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("create_index\n")), + ACE_TEXT ("create_index\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -1339,12 +1339,12 @@ ACE_Configuration_Heap::create_index (void) { // Attempt to clean up. ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("create_index failed\n"))); + ACE_TEXT ("create_index failed\n"))); this->allocator_->remove (); return -1; } // Add the root section - return new_section (ACE_LIB_TEXT (""), root_); + return new_section (ACE_TEXT (""), root_); } return 0; } @@ -1406,7 +1406,7 @@ ACE_Configuration_Heap::add_section (const ACE_Configuration_Section_Key& base, // Create the new section name // only prepend a separater if were not at the root if (section.length ()) - section += ACE_LIB_TEXT ("\\"); + section += ACE_TEXT ("\\"); section += sub_section; @@ -1536,7 +1536,7 @@ ACE_Configuration_Heap::open_section (const ACE_Configuration_Section_Key& base, result = base; for (const ACE_TCHAR* separator; - (separator = ACE_OS::strchr (sub_section, ACE_LIB_TEXT ('\\'))) != 0; + (separator = ACE_OS::strchr (sub_section, ACE_TEXT ('\\'))) != 0; ) { ACE_TString simple_section (sub_section, separator - sub_section); @@ -1566,7 +1566,7 @@ ACE_Configuration_Heap::open_simple_section (const ACE_Configuration_Section_Key // Only add the \\ if were not at the root if (section.length ()) { - section += ACE_LIB_TEXT ("\\"); + section += ACE_TEXT ("\\"); } section += sub_section; @@ -1615,7 +1615,7 @@ ACE_Configuration_Heap::remove_section (const ACE_Configuration_Section_Key& key // Find this subkey if (section.length ()) - section += ACE_LIB_TEXT ("\\"); + section += ACE_TEXT ("\\"); section += sub_section; ACE_Configuration_ExtId SectionExtId (section.fast_rep ()); diff --git a/ACE/ace/Configuration_Import_Export.cpp b/ACE/ace/Configuration_Import_Export.cpp index 460a04b202c..ce4cbac84c1 100644 --- a/ACE/ace/Configuration_Import_Export.cpp +++ b/ACE/ace/Configuration_Import_Export.cpp @@ -36,7 +36,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) errno = EINVAL; return -1; } - FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); + FILE* in = ACE_OS::fopen (filename, ACE_TEXT ("r")); if (!in) return -1; @@ -57,7 +57,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) { // Check if we got all the line. end = ACE_OS::strrchr (buffer + read_pos, - ACE_LIB_TEXT ('\n')); // look for end of line + ACE_TEXT ('\n')); // look for end of line if (!end) // we havn't reach the end of the line yet { // allocate a new buffer - double size the previous one @@ -82,13 +82,13 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) read_pos = 0; // Check for a comment - if (buffer[0] == ACE_LIB_TEXT (';') || buffer[0] == ACE_LIB_TEXT ('#')) + if (buffer[0] == ACE_TEXT (';') || buffer[0] == ACE_TEXT ('#')) continue; - if (buffer[0] == ACE_LIB_TEXT ('[')) + if (buffer[0] == ACE_TEXT ('[')) { // We have a new section here, strip out the section name - end = ACE_OS::strrchr (buffer, ACE_LIB_TEXT (']')); + end = ACE_OS::strrchr (buffer, ACE_TEXT (']')); if (!end) { ACE_OS::fclose (in); @@ -106,7 +106,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) continue; } // end if firs char is a [ - if (buffer[0] == ACE_LIB_TEXT ('"')) + if (buffer[0] == ACE_TEXT ('"')) { // we have a value end = ACE_OS::strchr (buffer+1, '"'); @@ -133,7 +133,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) return -4; } } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("dword:"), 6) == 0) + else if (ACE_OS::strncmp (end, ACE_TEXT ("dword:"), 6) == 0) { // number type ACE_TCHAR* endptr = 0; @@ -145,7 +145,7 @@ ACE_Registry_ImpExp::import_config (const ACE_TCHAR* filename) return -4; } } - else if (ACE_OS::strncmp (end, ACE_LIB_TEXT ("hex:"), 4) == 0) + else if (ACE_OS::strncmp (end, ACE_TEXT ("hex:"), 4) == 0) { // binary type size_t string_length = ACE_OS::strlen (end + 4); @@ -224,11 +224,11 @@ ACE_Registry_ImpExp::export_config (const ACE_TCHAR* filename) } int result = -1; - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); + FILE* out = ACE_OS::fopen (filename, ACE_TEXT ("w")); if (out) { result = this->export_section (config_.root_section (), - ACE_LIB_TEXT (""), + ACE_TEXT (""), out); // The data may have been buffered and will be flush on close, // so we need to check that the close succeeds. @@ -251,10 +251,10 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio if (path.length ()) { // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); + ACE_TString header = ACE_TEXT ("["); header += path; - header += ACE_LIB_TEXT ("]"); - header += ACE_LIB_TEXT (" \n"); + header += ACE_TEXT ("]"); + header += ACE_TEXT (" \n"); if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; // Write out each value @@ -269,7 +269,7 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio ACE_TString string_value; while (!config_.enumerate_values (section, index, name, type)) { - line = ACE_LIB_TEXT ("\"") + name + ACE_LIB_TEXT ("\"="); + line = ACE_TEXT ("\"") + name + ACE_TEXT ("\"="); switch (type) { case ACE_Configuration::INTEGER: @@ -277,8 +277,8 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio u_int value; if (config_.get_integer_value (section, name.fast_rep (), value)) return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); - line += ACE_LIB_TEXT ("dword:"); + ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), value); + line += ACE_TEXT ("dword:"); line += int_value; break; } @@ -288,8 +288,8 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio name.fast_rep (), string_value)) return -2; - line += ACE_LIB_TEXT ("\""); - line += string_value + ACE_LIB_TEXT ("\""); + line += ACE_TEXT ("\""); + line += string_value + ACE_TEXT ("\""); break; } #ifdef _WIN32 @@ -306,15 +306,15 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio binary_data, binary_length)) return -2; - line += ACE_LIB_TEXT ("hex:"); + line += ACE_TEXT ("hex:"); unsigned char* ptr = (unsigned char*)binary_data; while (binary_length) { if (ptr != binary_data) { - line += ACE_LIB_TEXT (","); + line += ACE_TEXT (","); } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); + ACE_OS::sprintf (bin_value, ACE_TEXT ("%02x"), *ptr); line += bin_value; --binary_length; ++ptr; @@ -325,7 +325,7 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio default: return -3; } - line += ACE_LIB_TEXT ("\n"); + line += ACE_TEXT ("\n"); if (ACE_OS::fputs (line.fast_rep (), out) < 0) return -4; ++index; @@ -340,7 +340,7 @@ ACE_Registry_ImpExp::export_section (const ACE_Configuration_Section_Key& sectio { ACE_TString sub_section (path); if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); + sub_section += ACE_TEXT ("\\"); sub_section += name; if (config_.open_section (section, name.fast_rep (), 0, sub_key)) return -5; @@ -359,7 +359,7 @@ ACE_Registry_ImpExp::process_previous_line_format (ACE_TCHAR* buffer, ACE_Configuration_Section_Key& section) { // Chop any cr/lf at the end of the line. - ACE_TCHAR *endp = ACE_OS::strpbrk (buffer, ACE_LIB_TEXT ("\r\n")); + ACE_TCHAR *endp = ACE_OS::strpbrk (buffer, ACE_TEXT ("\r\n")); if (endp != 0) *endp = '\0'; @@ -407,7 +407,7 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) errno = EINVAL; return -1; } - FILE* in = ACE_OS::fopen (filename, ACE_LIB_TEXT ("r")); + FILE* in = ACE_OS::fopen (filename, ACE_TEXT ("r")); if (!in) return -1; @@ -418,15 +418,15 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) { ACE_TCHAR *line = this->squish (buffer); // Check for a comment and blank line - if (line[0] == ACE_LIB_TEXT (';') || - line[0] == ACE_LIB_TEXT ('#') || + if (line[0] == ACE_TEXT (';') || + line[0] == ACE_TEXT ('#') || line[0] == '\0') continue; - if (line[0] == ACE_LIB_TEXT ('[')) + if (line[0] == ACE_TEXT ('[')) { // We have a new section here, strip out the section name - ACE_TCHAR* end = ACE_OS::strrchr (line, ACE_LIB_TEXT (']')); + ACE_TCHAR* end = ACE_OS::strrchr (line, ACE_TEXT (']')); if (!end) { ACE_OS::fclose (in); @@ -447,7 +447,7 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) } // We have a line; name ends at equal sign. - ACE_TCHAR *end = ACE_OS::strchr (line, ACE_LIB_TEXT ('=')); + ACE_TCHAR *end = ACE_OS::strchr (line, ACE_TEXT ('=')); if (end == 0) // No '=' { ACE_OS::fclose (in); @@ -470,8 +470,8 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* filename) // ACE 5.2 (and maybe earlier) exported strings may be enclosed // in quotes. If string is quote-delimited, strip the quotes. // Newer exported files don't have quote delimiters. - if (value[0] == ACE_LIB_TEXT ('"') && - value[value_len - 1] == ACE_LIB_TEXT ('"')) + if (value[0] == ACE_TEXT ('"') && + value[value_len - 1] == ACE_TEXT ('"')) { // Strip quotes off both ends. value[value_len - 1] = '\0'; @@ -509,11 +509,11 @@ ACE_Ini_ImpExp::export_config (const ACE_TCHAR* filename) } int result = -1; - FILE* out = ACE_OS::fopen (filename, ACE_LIB_TEXT ("w")); + FILE* out = ACE_OS::fopen (filename, ACE_TEXT ("w")); if (out) { result = this->export_section (config_.root_section (), - ACE_LIB_TEXT (""), + ACE_TEXT (""), out); // The data may have been buffered and will be flush on close, // so we need to check that the close succeeds. @@ -536,9 +536,9 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, if (path.length ()) { // Write out the section header - ACE_TString header = ACE_LIB_TEXT ("["); + ACE_TString header = ACE_TEXT ("["); header += path; - header += ACE_LIB_TEXT ("]\n"); + header += ACE_TEXT ("]\n"); if (ACE_OS::fputs (header.fast_rep (), out) < 0) return -1; // Write out each value @@ -553,7 +553,7 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, ACE_TString string_value; while (!config_.enumerate_values (section, index, name, type)) { - line = name + ACE_LIB_TEXT ("="); + line = name + ACE_TEXT ("="); switch (type) { case ACE_Configuration::INTEGER: @@ -561,7 +561,7 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, u_int value; if (config_.get_integer_value (section, name.fast_rep (), value)) return -2; - ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), value); + ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), value); line += int_value; break; } @@ -588,20 +588,20 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, binary_data, binary_length)) return -2; - line += ACE_LIB_TEXT ("\""); + line += ACE_TEXT ("\""); unsigned char* ptr = (unsigned char*)binary_data; while (binary_length) { if (ptr != binary_data) { - line += ACE_LIB_TEXT (","); + line += ACE_TEXT (","); } - ACE_OS::sprintf (bin_value, ACE_LIB_TEXT ("%02x"), *ptr); + ACE_OS::sprintf (bin_value, ACE_TEXT ("%02x"), *ptr); line += bin_value; --binary_length; ++ptr; } - line += ACE_LIB_TEXT ("\""); + line += ACE_TEXT ("\""); delete [] (char *) binary_data; break; } @@ -610,7 +610,7 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, }// end switch on type - line += ACE_LIB_TEXT ("\n"); + line += ACE_TEXT ("\n"); if (ACE_OS::fputs (line.fast_rep (), out) < 0) return -4; ++index; @@ -625,7 +625,7 @@ ACE_Ini_ImpExp::export_section (const ACE_Configuration_Section_Key& section, { ACE_TString sub_section (path); if (path.length ()) - sub_section += ACE_LIB_TEXT ("\\"); + sub_section += ACE_TEXT ("\\"); sub_section += name; if (config_.open_section (section, name.fast_rep (), 0, sub_key)) return -5; diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp index 6eea42ee330..628b530801d 100644 --- a/ACE/ace/Connector.cpp +++ b/ACE/ace/Connector.cpp @@ -60,8 +60,8 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump (void) const ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("svc_handler_ = %x"), this->svc_handler_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("svc_handler_ = %x"), this->svc_handler_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d"), this->timer_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -189,7 +189,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump (void) const ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %d"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %d"), this->flags_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -665,7 +665,7 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) if (handler == 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%t: Connector::close h %d, no handler\n"), + ACE_TEXT ("%t: Connector::close h %d, no handler\n"), *handle)); // Remove handle from the set of non-blocking handles. this->non_blocking_handles ().remove (*handle); @@ -678,8 +678,8 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void) if (nbch == 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%t: Connector::close h %d handler %@ ") - ACE_LIB_TEXT ("not a legit handler\n"), + ACE_TEXT ("%t: Connector::close h %d handler %@ ") + ACE_TEXT ("not a legit handler\n"), *handle, handler)); // Remove handle from the set of non-blocking handles. @@ -736,9 +736,9 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::info (ACE_TCHAR **strp, size_t ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s"), - ACE_LIB_TEXT ("ACE_Connector"), - ACE_LIB_TEXT ("# connector factory\n")); + ACE_TEXT ("%s\t %s"), + ACE_TEXT ("ACE_Connector"), + ACE_TEXT ("# connector factory\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -856,7 +856,7 @@ ACE_Strategy_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connecto ACE_TRACE ("ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::ACE_Strategy_Connector"); if (this->open (reactor, cre_s, conn_s, con_s, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Strategy_Connector::ACE_Strategy_Connector"))); } template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> diff --git a/ACE/ace/Containers_T.cpp b/ACE/ace/Containers_T.cpp index 410ace335af..c28e3e1fc41 100644 --- a/ACE/ace/Containers_T.cpp +++ b/ACE/ace/Containers_T.cpp @@ -443,7 +443,7 @@ template <class T> void ACE_Double_Linked_List_Iterator_Base<T>::dump_i (void) const { ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %x"), this->current_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %x"), this->current_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -1650,9 +1650,9 @@ ACE_Ordered_MultiSet<T>::dump (void) const // ACE_TRACE ("ACE_Ordered_MultiSet<T>::dump"); // // ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); // // T *item = 0; // size_t count = 1; @@ -1660,7 +1660,7 @@ ACE_Ordered_MultiSet<T>::dump (void) const // for (ACE_Ordered_MultiSet_Iterator<T> iter (*(ACE_Ordered_MultiSet<T> *) this); // iter.next (item) != 0; // iter.advance ()) - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); // // ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/DEV_Addr.cpp b/ACE/ace/DEV_Addr.cpp index f7e5503b1eb..39d1768051f 100644 --- a/ACE/ace/DEV_Addr.cpp +++ b/ACE/ace/DEV_Addr.cpp @@ -44,7 +44,7 @@ ACE_DEV_Addr::dump (void) const ACE_TRACE ("ACE_DEV_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("devname_ = %s"), this->devname_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("devname_ = %s"), this->devname_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/DEV_Connector.inl b/ACE/ace/DEV_Connector.inl index 13ceeba1d75..314952699de 100644 --- a/ACE/ace/DEV_Connector.inl +++ b/ACE/ace/DEV_Connector.inl @@ -19,8 +19,8 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_DEV_IO"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), + remote_sap.get_path_name (), ACE_TEXT ("ACE_DEV_IO"))); } ACE_INLINE int diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp index d4a7962944a..f4ecdbb4aa2 100644 --- a/ACE/ace/DLL.cpp +++ b/ACE/ace/DLL.cpp @@ -44,7 +44,7 @@ ACE_DLL::ACE_DLL (const ACE_DLL &rhs) rhs.close_handle_on_destruction_) != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::copy_ctor: error: %s\n"), + ACE_TEXT ("ACE_DLL::copy_ctor: error: %s\n"), this->error ())); } @@ -85,7 +85,7 @@ ACE_DLL::ACE_DLL (const ACE_TCHAR *dll_name, if (this->open (dll_name, this->open_mode_, close_handle_on_destruction) != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::open: error calling open: %s\n"), + ACE_TEXT ("ACE_DLL::open: error calling open: %s\n"), this->error ())); } @@ -141,8 +141,8 @@ ACE_DLL::open_i (const ACE_TCHAR *dll_filename, { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL::open_i: dll_name is %s\n"), - this->dll_name_ == 0 ? ACE_LIB_TEXT ("(null)") + ACE_TEXT ("ACE_DLL::open_i: dll_name is %s\n"), + this->dll_name_ == 0 ? ACE_TEXT ("(null)") : this->dll_name_)); return -1; } @@ -224,7 +224,7 @@ ACE_DLL::error (void) const ACE_TRACE ("ACE_DLL::error"); if (this->error_) return - const_cast<ACE_TCHAR *> (ACE_LIB_TEXT ("Error: check log for details.")); + const_cast<ACE_TCHAR *> (ACE_TEXT ("Error: check log for details.")); return 0; } diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index 7799d1e26ac..83c07cd125d 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -61,8 +61,8 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) DLL_Handle::open: error, ") - ACE_LIB_TEXT ("tried to reopen %s with name %s\n"), + ACE_TEXT ("(%P|%t) DLL_Handle::open: error, ") + ACE_TEXT ("tried to reopen %s with name %s\n"), this->dll_name_, dll_name)); @@ -128,13 +128,13 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_LIB_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") + ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), name->c_str (), open_mode, ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) - ? ACE_LIB_TEXT ("succeeded") - : ACE_LIB_TEXT ("failed")), + ? ACE_TEXT ("succeeded") + : ACE_TEXT ("failed")), this->error()->c_str())); } @@ -149,9 +149,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // broken, should we continue at all? if ((errno != 0) && (errno != ENOENT) && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_LIB_TEXT ("(\'%s\') failed, errno=") - ACE_LIB_TEXT ("%d: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") + ACE_TEXT ("(\'%s\') failed, errno=") + ACE_TEXT ("%d: %s\n"), name->c_str (), errno, this->error ()->c_str ())); @@ -160,24 +160,24 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // AIX often puts the shared library file (most often named // shr.o) inside an archive library. If this is an archive // library name, then try appending [shr.o] and retry. - if (ACE_TString::npos != name->strstr (ACE_LIB_TEXT (".a"))) + if (ACE_TString::npos != name->strstr (ACE_TEXT (".a"))) { ACE_TCHAR aix_pathname[MAXPATHLEN + 1]; ACE_OS::strncpy (aix_pathname, name->c_str (), name->length ()); aix_pathname[name->length ()] = '\0'; - ACE_OS::strcat (aix_pathname, ACE_LIB_TEXT ("(shr.o)")); + ACE_OS::strcat (aix_pathname, ACE_TEXT ("(shr.o)")); open_mode |= RTLD_MEMBER; if (ACE::debug ()) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_LIB_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") + ACE_TEXT ("(\"%s\", 0x%x) -> %s: %s\n"), aix_pathname, open_mode, - ACE_LIB_TEXT ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) + ACE_TEXT ((this->handle_ != ACE_SHLIB_INVALID_HANDLE) ? "succeeded" : "failed"), this->error()->c_str())); @@ -195,9 +195,9 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, // should we continue at all? if (ACE::debug () && (errno != 0) && (errno != ENOENT)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open ") - ACE_LIB_TEXT ("(\'%s\') failed, errno=") - ACE_LIB_TEXT ("%d: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open ") + ACE_TEXT ("(\'%s\') failed, errno=") + ACE_TEXT ("%d: %s\n"), name->c_str (), errno, this->error ()->c_str ())); @@ -212,8 +212,8 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ") - ACE_LIB_TEXT ("Invalid handle error: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open (\"%s\"): ") + ACE_TEXT ("Invalid handle error: %s\n"), this->dll_name_, this->error ()->c_str ())); @@ -226,7 +226,7 @@ ACE_DLL_Handle::open (const ACE_TCHAR *dll_name, if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::open - %s (%d), refcount=%d\n"), this->dll_name_, this->handle_, this->refcount_)); @@ -258,8 +258,8 @@ ACE_DLL_Handle::close (int unload) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close - ") - ACE_LIB_TEXT ("%s (handle=%d, refcount=%d)\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") + ACE_TEXT ("%s (handle=%d, refcount=%d)\n"), this->dll_name_, this->handle_, this->refcount_)); @@ -270,8 +270,8 @@ ACE_DLL_Handle::close (int unload) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close: ") - ACE_LIB_TEXT ("Unloading %s (handle=%d)\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::close: ") + ACE_TEXT ("Unloading %s (handle=%d)\n"), this->dll_name_, this->handle_)); @@ -293,8 +293,8 @@ ACE_DLL_Handle::close (int unload) if (retval != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::close - ") - ACE_LIB_TEXT ("Failed with: \"%s\".\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::close - ") + ACE_TEXT ("Failed with: \"%s\".\n"), this->error ()->c_str ())); } @@ -332,8 +332,8 @@ ACE_DLL_Handle::symbol (const ACE_TCHAR *sym_name, int ignore_errors) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::symbol (\"%s\") ") - ACE_LIB_TEXT (" failed with \"%s\".\n"), + ACE_TEXT ("ACE (%P|%t) DLL_Handle::symbol (\"%s\") ") + ACE_TEXT (" failed with \"%s\".\n"), auto_name.get (), this->error ()->c_str ())); @@ -354,8 +354,8 @@ ACE_DLL_Handle::get_handle (int become_owner) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") - ACE_LIB_TEXT ("cannot become owner, refcount == 0.\n"))); + ACE_TEXT ("ACE (%P|%t) DLL_Handle::get_handle: ") + ACE_TEXT ("cannot become owner, refcount == 0.\n"))); return ACE_SHLIB_INVALID_HANDLE; } @@ -370,10 +370,10 @@ ACE_DLL_Handle::get_handle (int become_owner) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) ACE_DLL_Handle::get_handle: ") - ACE_LIB_TEXT ("post call: handle %s, refcount %d\n"), + ACE_TEXT ("ACE (%P|%t) ACE_DLL_Handle::get_handle: ") + ACE_TEXT ("post call: handle %s, refcount %d\n"), this->handle_ == ACE_SHLIB_INVALID_HANDLE ? - ACE_LIB_TEXT ("invalid") : ACE_LIB_TEXT ("valid"), + ACE_TEXT ("invalid") : ACE_TEXT ("valid"), this->refcount_)); return handle; @@ -387,7 +387,7 @@ ACE_DLL_Handle::error (void) ACE_TRACE ("ACE_DLL_Handle::error"); const ACE_TCHAR *error = ACE_OS::dlerror (); auto_ptr<ACE_TString> str - (new ACE_TString (error ? error : ACE_LIB_TEXT ("no error"))); + (new ACE_TString (error ? error : ACE_TEXT ("no error"))); return str; } @@ -413,7 +413,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, // 2. Locate the file suffix, if there is one. Move the '.' and the // suffix to base_suffix. - if ((pos = base_file.rfind (ACE_LIB_TEXT ('.'))) != ACE_TString::npos) + if ((pos = base_file.rfind (ACE_TEXT ('.'))) != ACE_TString::npos) { base_suffix = base_file.substr (pos); base_file = base_file.substr (0, pos); @@ -537,8 +537,8 @@ ACE_DLL_Manager::ACE_DLL_Manager (int size) if (this->open (size) != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager ctor failed to allocate ") - ACE_LIB_TEXT ("handle_vector_.\n"))); + ACE_TEXT ("ACE_DLL_Manager ctor failed to allocate ") + ACE_TEXT ("handle_vector_.\n"))); } ACE_DLL_Manager::~ACE_DLL_Manager (void) @@ -547,8 +547,8 @@ ACE_DLL_Manager::~ACE_DLL_Manager (void) if (this->close () != 0 && ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager dtor failed to close ") - ACE_LIB_TEXT ("properly.\n"))); + ACE_TEXT ("ACE_DLL_Manager dtor failed to close ") + ACE_TEXT ("properly.\n"))); } ACE_DLL_Handle * @@ -583,8 +583,8 @@ ACE_DLL_Manager::open_dll (const ACE_TCHAR *dll_name, // Error while opening dll. Free temp handle if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::open_dll: Could not ") - ACE_LIB_TEXT ("open dll %s.\n"), + ACE_TEXT ("ACE_DLL_Manager::open_dll: Could not ") + ACE_TEXT ("open dll %s.\n"), dll_name)); delete temp_handle; @@ -741,7 +741,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) typedef int (*dll_unload_policy)(void); void * const unload_policy_ptr = - dll_handle->symbol (ACE_LIB_TEXT ("_get_dll_unload_policy"), 1); + dll_handle->symbol (ACE_TEXT ("_get_dll_unload_policy"), 1); #if defined (ACE_OPENVMS) && (!defined (__INITIAL_POINTER_SIZE) || (__INITIAL_POINTER_SIZE < 64)) int const temp_p = reinterpret_cast<int> (unload_policy_ptr); @@ -766,7 +766,7 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::unload error.\n"))); + ACE_TEXT ("ACE_DLL_Manager::unload error.\n"))); return -1; } @@ -775,8 +775,8 @@ ACE_DLL_Manager::unload_dll (ACE_DLL_Handle *dll_handle, int force_unload) { if (ACE::debug ()) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_DLL_Manager::unload_dll called with ") - ACE_LIB_TEXT ("null pointer.\n"))); + ACE_TEXT ("ACE_DLL_Manager::unload_dll called with ") + ACE_TEXT ("null pointer.\n"))); return -1; } diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index 0f7b2cf587e..ce435121681 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -51,7 +51,7 @@ #endif /* ACE_DEFAULT_PAGEFILE_POOL_CHUNK */ #if !defined (ACE_DEFAULT_PAGEFILE_POOL_NAME) -#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_LIB_TEXT ("Default_ACE_Pagefile_Memory_Pool") +#define ACE_DEFAULT_PAGEFILE_POOL_NAME ACE_TEXT ("Default_ACE_Pagefile_Memory_Pool") #endif /* ACE_DEFAULT_PAGEFILE_POOL_NAME */ #if !defined (ACE_DEFAULT_MESSAGE_BLOCK_PRIORITY) @@ -124,7 +124,7 @@ # endif /* ACE_DEFAULT_MAX_SOCKET_BUFSIZ */ # if !defined (ACE_DEFAULT_SERVER_PORT_STR) -# define ACE_DEFAULT_SERVER_PORT_STR ACE_LIB_TEXT("20002") +# define ACE_DEFAULT_SERVER_PORT_STR ACE_TEXT("20002") # endif /* ACE_DEFAULT_SERVER_PORT_STR */ // Used for the Service_Directory test @@ -199,9 +199,9 @@ // Used by the FIFO tests and the Client_Logging_Handler netsvc. # if !defined (ACE_DEFAULT_RENDEZVOUS) # if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("/tmp/fifo.ace") +# define ACE_DEFAULT_RENDEZVOUS ACE_TEXT("/tmp/fifo.ace") # else -# define ACE_DEFAULT_RENDEZVOUS ACE_LIB_TEXT("localhost:20010") +# define ACE_DEFAULT_RENDEZVOUS ACE_TEXT("localhost:20010") # endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_RENDEZVOUS */ @@ -213,23 +213,23 @@ # if !defined (ACE_DEFAULT_LOGGER_KEY) # if defined (ACE_HAS_STREAM_PIPES) -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") +# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") # else -# define ACE_DEFAULT_LOGGER_KEY ACE_LIB_TEXT ("localhost:20012") +# define ACE_DEFAULT_LOGGER_KEY ACE_TEXT ("localhost:20012") # endif /* ACE_HAS_STREAM_PIPES */ # endif /* ACE_DEFAULT_LOGGER_KEY */ // The way to specify the local host for loopback IP. This is usually // "localhost" but it may need changing on some platforms. # if !defined (ACE_LOCALHOST) -# define ACE_LOCALHOST ACE_LIB_TEXT ("localhost") +# define ACE_LOCALHOST ACE_TEXT ("localhost") # endif // This specification for an IPv6 localhost should work on all platforms // supporting IPv6 # if defined (ACE_HAS_IPV6) # if !defined (ACE_IPV6_LOCALHOST) -# define ACE_IPV6_LOCALHOST ACE_LIB_TEXT ("::1") +# define ACE_IPV6_LOCALHOST ACE_TEXT ("::1") # endif /* ACE_IPV6_LOCALHOST*/ #endif /* ACE_HAS_IPV6 */ @@ -237,7 +237,7 @@ // supporting IPv6 # if defined (ACE_HAS_IPV6) # if !defined (ACE_IPV6_ANY) -# define ACE_IPV6_ANY ACE_LIB_TEXT ("::") +# define ACE_IPV6_ANY ACE_TEXT ("::") # endif /* ACE_IPV6_ANY*/ #endif /* ACE_HAS_IPV6 */ @@ -433,8 +433,8 @@ # define ACE_DIRECTORY_SEPARATOR_CHAR_W ACE_TEXT_WIDE(ACE_DIRECTORY_SEPARATOR_CHAR_A) #endif /* ACE_HAS_WCHAR */ -#define ACE_DIRECTORY_SEPARATOR_STR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_STR_A) -#define ACE_DIRECTORY_SEPARATOR_CHAR ACE_LIB_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A) +#define ACE_DIRECTORY_SEPARATOR_STR ACE_TEXT (ACE_DIRECTORY_SEPARATOR_STR_A) +#define ACE_DIRECTORY_SEPARATOR_CHAR ACE_TEXT (ACE_DIRECTORY_SEPARATOR_CHAR_A) #if !defined (ACE_DEFAULT_THREAD_PRIORITY) # define ACE_DEFAULT_THREAD_PRIORITY (-0x7fffffffL - 1L) @@ -475,42 +475,42 @@ # define ACE_PLATFORM_EXE_SUFFIX_W ACE_TEXT_WIDE(ACE_PLATFORM_EXE_SUFFIX_A) #endif /* ACE_HAS_WCHAR */ -#define ACE_PLATFORM ACE_LIB_TEXT (ACE_PLATFORM_A) -#define ACE_PLATFORM_EXE_SUFFIX ACE_LIB_TEXT (ACE_PLATFORM_EXE_SUFFIX_A) +#define ACE_PLATFORM ACE_TEXT (ACE_PLATFORM_A) +#define ACE_PLATFORM_EXE_SUFFIX ACE_TEXT (ACE_PLATFORM_EXE_SUFFIX_A) #if defined (ACE_WIN32) -# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("PATH") -# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (";") -# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll") +# define ACE_LD_SEARCH_PATH ACE_TEXT ("PATH") +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (";") +# define ACE_DLL_SUFFIX ACE_TEXT (".dll") # if defined (__MINGW32__) -# define ACE_DLL_PREFIX ACE_LIB_TEXT ("lib") +# define ACE_DLL_PREFIX ACE_TEXT ("lib") # else /* __MINGW32__ */ -# define ACE_DLL_PREFIX ACE_LIB_TEXT ("") +# define ACE_DLL_PREFIX ACE_TEXT ("") # endif /* __MINGW32__ */ #else /* !ACE_WIN32 */ # if !defined (ACE_LD_SEARCH_PATH) -# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("LD_LIBRARY_PATH") +# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") # endif /* ACE_LD_SEARCH_PATH */ # if !defined (ACE_LD_SEARCH_PATH_SEPARATOR_STR) -# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_LIB_TEXT (":") +# define ACE_LD_SEARCH_PATH_SEPARATOR_STR ACE_TEXT (":") # endif /* ACE_LD_SEARCH_PATH_SEPARATOR_STR */ #endif /* ACE_WIN32 */ #if !defined (ACE_DLL_SUFFIX) -# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".so") +# define ACE_DLL_SUFFIX ACE_TEXT (".so") #endif /* ACE_DLL_SUFFIX */ #if !defined (ACE_DLL_PREFIX) -# define ACE_DLL_PREFIX ACE_LIB_TEXT ("lib") +# define ACE_DLL_PREFIX ACE_TEXT ("lib") #endif /* ACE_DLL_PREFIX */ #if defined (ACE_WIN32) // Used for dynamic linking # if !defined (ACE_DEFAULT_SVC_CONF) # if (ACE_USES_CLASSIC_SVC_CONF == 1) -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf") +# define ACE_DEFAULT_SVC_CONF ACE_TEXT (".\\svc.conf") # else -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT (".\\svc.conf.xml") +# define ACE_DEFAULT_SVC_CONF ACE_TEXT (".\\svc.conf.xml") # endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */ # endif /* ACE_DEFAULT_SVC_CONF */ #endif /* ACE_WIN32 */ @@ -518,14 +518,14 @@ // Used for dynamic linking. #if !defined (ACE_DEFAULT_SVC_CONF) # if (ACE_USES_CLASSIC_SVC_CONF == 1) -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf") +# define ACE_DEFAULT_SVC_CONF ACE_TEXT ("./svc.conf") # else -# define ACE_DEFAULT_SVC_CONF ACE_LIB_TEXT ("./svc.conf.xml") +# define ACE_DEFAULT_SVC_CONF ACE_TEXT ("./svc.conf.xml") # endif /* ACE_USES_CLASSIC_SVC_CONF ==1 */ #endif /* ACE_DEFAULT_SVC_CONF */ #if !defined (ACE_LOGGER_KEY) -# define ACE_LOGGER_KEY ACE_LIB_TEXT ("/tmp/server_daemon") +# define ACE_LOGGER_KEY ACE_TEXT ("/tmp/server_daemon") #endif /* ACE_LOGGER_KEY */ // Theses defines are used by the ACE Name Server. @@ -548,7 +548,7 @@ # if defined (ACE_HAS_WCHAR) # define ACE_DEFAULT_NAMESPACE_DIR_W ACE_TEXT_WIDE(ACE_DEFAULT_NAMESPACE_DIR_A) # endif /* ACE_HAS_WCHAR */ -# define ACE_DEFAULT_NAMESPACE_DIR ACE_LIB_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A) +# define ACE_DEFAULT_NAMESPACE_DIR ACE_TEXT(ACE_DEFAULT_NAMESPACE_DIR_A) #endif /* ACE_LEGACY_MODE */ #if defined (ACE_HAS_WCHAR) @@ -556,8 +556,8 @@ # define ACE_DEFAULT_GLOBALNAME_W ACE_TEXT_WIDE(ACE_DEFAULT_GLOBALNAME_A) #endif /* ACE_HAS_WCHAR */ -#define ACE_DEFAULT_LOCALNAME ACE_LIB_TEXT (ACE_DEFAULT_LOCALNAME_A) -#define ACE_DEFAULT_GLOBALNAME ACE_LIB_TEXT (ACE_DEFAULT_GLOBALNAME_A) +#define ACE_DEFAULT_LOCALNAME ACE_TEXT (ACE_DEFAULT_LOCALNAME_A) +#define ACE_DEFAULT_GLOBALNAME ACE_TEXT (ACE_DEFAULT_GLOBALNAME_A) # if defined (ACE_WIN32) // The "null" device on Win32. diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 9887c2834ba..51f5654326b 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -372,7 +372,7 @@ ACE_Dev_Poll_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) default: // Should we bail out if we get an invalid mask? ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("dispatch_notify invalid mask = %d\n"), + ACE_TEXT ("dispatch_notify invalid mask = %d\n"), buffer.mask_)); } if (result == -1) @@ -428,7 +428,7 @@ ACE_Dev_Poll_Reactor_Notify::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("dp_reactor_ = %@"), + ACE_TEXT ("dp_reactor_ = %@"), this->dp_reactor_)); this->notification_pipe_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -630,10 +630,10 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh, disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::open ") - ACE_LIB_TEXT ("failed inside ") - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::CTOR"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Dev_Poll_Reactor::open ") + ACE_TEXT ("failed inside ") + ACE_TEXT ("ACE_Dev_Poll_Reactor::CTOR"))); } ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, @@ -676,9 +676,9 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (size_t size, disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Dev_Poll_Reactor::open ") - ACE_LIB_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Dev_Poll_Reactor::open ") + ACE_TEXT ("failed inside ACE_Dev_Poll_Reactor::CTOR"))); } ACE_Dev_Poll_Reactor::~ACE_Dev_Poll_Reactor (void) @@ -2367,14 +2367,14 @@ ACE_Dev_Poll_Reactor::dump (void) const ACE_TRACE ("ACE_Dev_Poll_Reactor::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("initialized_ = %d"), + ACE_TEXT ("initialized_ = %d"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("poll_fd_ = %d"), this->poll_fd_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %u"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("poll_fd_ = %d"), this->poll_fd_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %u"), this->size_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("deactivated_ = %d"), + ACE_TEXT ("deactivated_ = %d"), this->deactivated_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Dirent.inl b/ACE/ace/Dirent.inl index 0a8f0b9e6e4..5f6af5a3218 100644 --- a/ACE/ace/Dirent.inl +++ b/ACE/ace/Dirent.inl @@ -38,8 +38,8 @@ ACE_Dirent::ACE_Dirent (const ACE_TCHAR *dirname) { if (this->open (dirname) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Dirent::ACE_Dirent"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Dirent::ACE_Dirent"))); } ACE_INLINE diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp index cc5e9114871..b6977d460ae 100644 --- a/ACE/ace/Dynamic_Service_Base.cpp +++ b/ACE/ace/Dynamic_Service_Base.cpp @@ -20,7 +20,7 @@ ACE_Dynamic_Service_Base::dump (void) const ACE_TRACE ("ACE_Dynamic_Service_Base::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -92,16 +92,16 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ()); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") - ACE_LIB_TEXT (" type=%@ => %@"), + ACE_TEXT ("ACE (%P|%t) DSB::instance, repo=%@, name=%s") + ACE_TEXT (" type=%@ => %@"), repo->repo_, name, type, obj)); if (repo->repo_ != repo_found->repo_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT (" [in repo=%@]\n"), + ACE_TEXT (" [in repo=%@]\n"), repo_found->repo_)); else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); } return obj; diff --git a/ACE/ace/Event.cpp b/ACE/ace/Event.cpp index f3f2c26bd68..e185ec37117 100644 --- a/ACE/ace/Event.cpp +++ b/ACE/ace/Event.cpp @@ -28,8 +28,8 @@ ACE_Event::ACE_Event (int manual_reset, arg, sa) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Event::ACE_Event"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Event::ACE_Event"))); } ACE_Event::~ACE_Event (void) diff --git a/ACE/ace/FIFO.cpp b/ACE/ace/FIFO.cpp index cff340b6d57..22172e376f7 100644 --- a/ACE/ace/FIFO.cpp +++ b/ACE/ace/FIFO.cpp @@ -25,7 +25,7 @@ ACE_FIFO::dump (void) const ACE_TRACE ("ACE_FIFO::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rendezvous_ = %s"), this->rendezvous_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rendezvous_ = %s"), this->rendezvous_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -53,7 +53,7 @@ ACE_FIFO::ACE_FIFO (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO::ACE_FIFO"); if (this->open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO"))); } ACE_FIFO::ACE_FIFO (void) diff --git a/ACE/ace/FIFO_Recv.cpp b/ACE/ace/FIFO_Recv.cpp index 50a39067bb0..ca1305cf71a 100644 --- a/ACE/ace/FIFO_Recv.cpp +++ b/ACE/ace/FIFO_Recv.cpp @@ -21,7 +21,7 @@ ACE_FIFO_Recv::dump (void) const ACE_TRACE ("ACE_FIFO_Recv::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_FIFO::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -82,7 +82,7 @@ ACE_FIFO_Recv::ACE_FIFO_Recv (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FIFO_Recv_Msg.cpp b/ACE/ace/FIFO_Recv_Msg.cpp index 7aa5b1d6721..68d77af8a78 100644 --- a/ACE/ace/FIFO_Recv_Msg.cpp +++ b/ACE/ace/FIFO_Recv_Msg.cpp @@ -61,7 +61,7 @@ ACE_FIFO_Recv_Msg::ACE_FIFO_Recv_Msg (const ACE_TCHAR *fifo_name, perms, persistent, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Recv_Msg"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Recv_Msg"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FIFO_Send.cpp b/ACE/ace/FIFO_Send.cpp index c29871430ed..47a3c90e814 100644 --- a/ACE/ace/FIFO_Send.cpp +++ b/ACE/ace/FIFO_Send.cpp @@ -51,8 +51,8 @@ ACE_FIFO_Send::ACE_FIFO_Send (const ACE_TCHAR *fifo_name, perms, sa) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_FIFO_Send::ACE_FIFO_Send"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FIFO_Send_Msg.cpp b/ACE/ace/FIFO_Send_Msg.cpp index f39c5d865e9..c06b737a6bb 100644 --- a/ACE/ace/FIFO_Send_Msg.cpp +++ b/ACE/ace/FIFO_Send_Msg.cpp @@ -74,7 +74,7 @@ ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg (const ACE_TCHAR *fifo_name, { ACE_TRACE ("ACE_FIFO_Send_Msg::ACE_FIFO_Send_Msg"); if (this->ACE_FIFO_Send_Msg::open (fifo_name, flags, perms, sa) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_FIFO_Send_Msg"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_FIFO_Send_Msg"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp index 79d92c49ad9..79d9db6e296 100644 --- a/ACE/ace/FILE_Addr.cpp +++ b/ACE/ace/FILE_Addr.cpp @@ -37,13 +37,13 @@ ACE_FILE_Addr::set (const ACE_FILE_Addr &sa) // -15 for ace-file-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->filename_, ACE_LIB_TEXT ("ace-fileXXXXXX")); + ACE_OS::strcat (this->filename_, ACE_TEXT ("ace-fileXXXXXX")); #endif /* ACE_DEFAULT_TEMP_FILE */ @@ -117,7 +117,7 @@ ACE_FILE_Addr::dump (void) const ACE_TRACE ("ACE_FILE_Addr::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("filename_ = %s"), this->filename_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("filename_ = %s"), this->filename_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/FILE_Connector.cpp b/ACE/ace/FILE_Connector.cpp index 2720063bbc1..c136b0b47eb 100644 --- a/ACE/ace/FILE_Connector.cpp +++ b/ACE/ace/FILE_Connector.cpp @@ -21,7 +21,7 @@ ACE_FILE_Connector::dump (void) const ACE_TRACE ("ACE_FILE_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/FILE_Connector.inl b/ACE/ace/FILE_Connector.inl index 7fbc9db5b33..d598341ba8d 100644 --- a/ACE/ace/FILE_Connector.inl +++ b/ACE/ace/FILE_Connector.inl @@ -20,9 +20,9 @@ ACE_FILE_Connector::ACE_FILE_Connector (ACE_FILE_IO &new_io, reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("address %s, %p\n"), + ACE_TEXT ("address %s, %p\n"), remote_sap.get_path_name (), - ACE_LIB_TEXT ("ACE_FILE_IO"))); + ACE_TEXT ("ACE_FILE_IO"))); } ACE_INLINE int diff --git a/ACE/ace/File_Lock.cpp b/ACE/ace/File_Lock.cpp index 038e0224820..88935c3a5d7 100644 --- a/ACE/ace/File_Lock.cpp +++ b/ACE/ace/File_Lock.cpp @@ -33,8 +33,8 @@ ACE_File_Lock::ACE_File_Lock (ACE_HANDLE h, // ACE_TRACE ("ACE_File_Lock::ACE_File_Lock"); if (ACE_OS::flock_init (&this->lock_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"))); this->set_handle (h); } @@ -48,8 +48,8 @@ ACE_File_Lock::ACE_File_Lock (const ACE_TCHAR *name, if (this->open (name, flags, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p %s\n"), - ACE_LIB_TEXT ("ACE_File_Lock::ACE_File_Lock"), + ACE_TEXT ("%p %s\n"), + ACE_TEXT ("ACE_File_Lock::ACE_File_Lock"), name)); } diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp index 04b73baa46e..5122cb6fdc8 100644 --- a/ACE/ace/Filecache.cpp +++ b/ACE/ace/Filecache.cpp @@ -157,7 +157,7 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry ( ACE_Filecache_Hash_Entry *prev) : ext_id_ (ext_id ? ACE_OS::strdup (ext_id) - : ACE_OS::strdup (ACE_LIB_TEXT (""))), + : ACE_OS::strdup (ACE_TEXT (""))), int_id_ (int_id), next_ (next), prev_ (prev) @@ -250,7 +250,7 @@ ACE_Filecache::insert_i (const ACE_TCHAR *filename, ACE_Filecache_Object (filename, filelock, 0, mapit), 0); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: creating %s\n"), filename)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: creating %s\n"), filename)); if (this->hash_.bind (filename, handle) == -1) { @@ -373,7 +373,7 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit) filelock.release (); } } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (%t) CVF: found %s\n"), filename)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) CVF: found %s\n"), filename)); } return handle; @@ -533,7 +533,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (this->handle_ == ACE_INVALID_HANDLE) { this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: open")); + ACE_TEXT ("ACE_Filecache_Object::ctor: open")); return; } @@ -544,7 +544,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, PROT_READ, ACE_MAP_PRIVATE, 0, 0, this->sa_) != 0) { this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::ctor: map")); + ACE_TEXT ("ACE_Filecache_Object::ctor: map")); ACE_OS::close (this->handle_); this->handle_ = ACE_INVALID_HANDLE; return; @@ -586,7 +586,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (this->handle_ == ACE_INVALID_HANDLE) { this->error_i (ACE_Filecache_Object::ACE_OPEN_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: open")); + ACE_TEXT ("ACE_Filecache_Object::acquire: open")); return; } @@ -594,7 +594,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, if (ACE_OS::pwrite (this->handle_, "", 1, this->size_ - 1) != 1) { this->error_i (ACE_Filecache_Object::ACE_WRITE_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: write")); + ACE_TEXT ("ACE_Filecache_Object::acquire: write")); ACE_OS::close (this->handle_); return; } @@ -604,7 +604,7 @@ ACE_Filecache_Object::ACE_Filecache_Object (const ACE_TCHAR *filename, 0, 0, this->sa_) != 0) { this->error_i (ACE_Filecache_Object::ACE_MEMMAP_FAILED, - ACE_LIB_TEXT ("ACE_Filecache_Object::acquire: map")); + ACE_TEXT ("ACE_Filecache_Object::acquire: map")); ACE_OS::close (this->handle_); } @@ -620,7 +620,7 @@ ACE_Filecache_Object::~ACE_Filecache_Object (void) this->handle_ = ACE_INVALID_HANDLE; } - this->lock_.release (); + this->lock_.release (); } int @@ -695,7 +695,7 @@ int ACE_Filecache_Object::error_i (int error_value, const ACE_TCHAR *s) { s = s; - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p.\n"), s)); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p.\n"), s)); this->error_ = error_value; return error_value; } diff --git a/ACE/ace/Filecache.h b/ACE/ace/Filecache.h index 24c220b4f24..df1835b9372 100644 --- a/ACE/ace/Filecache.h +++ b/ACE/ace/Filecache.h @@ -265,7 +265,7 @@ public: // = error_ accessors int error (void) const; int error (int error_value, - const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); + const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); /// filename_ accessor const ACE_TCHAR *filename (void) const; @@ -292,7 +292,7 @@ protected: private: /// Internal error logging method, no locking. int error_i (int error_value, - const ACE_TCHAR *s = ACE_LIB_TEXT ("ACE_Filecache_Object")); + const ACE_TCHAR *s = ACE_TEXT ("ACE_Filecache_Object")); public: diff --git a/ACE/ace/Framework_Component.cpp b/ACE/ace/Framework_Component.cpp index 17c112f06c9..95697c6e952 100644 --- a/ACE/ace/Framework_Component.cpp +++ b/ACE/ace/Framework_Component.cpp @@ -137,8 +137,8 @@ ACE_Framework_Repository::register_component (ACE_Framework_Component *fc) fc->this_ == this->component_vector_[i]->this_) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("AFR::register_component: error, ") - ACE_LIB_TEXT ("compenent already registered\n")), + ACE_TEXT ("AFR::register_component: error, ") + ACE_TEXT ("compenent already registered\n")), -1); } @@ -198,8 +198,8 @@ ACE_Framework_Repository::remove_dll_components_i (const ACE_TCHAR *dll_name) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("AFR::remove_dll_components_i (%s) ") - ACE_LIB_TEXT ("component \"%s\"\n"), + ACE_TEXT ("AFR::remove_dll_components_i (%s) ") + ACE_TEXT ("component \"%s\"\n"), dll_name, this->component_vector_[i]->name_)); delete this->component_vector_[i]; this->component_vector_[i] = 0; @@ -273,8 +273,8 @@ ACE_Framework_Repository::ACE_Framework_Repository (int size) if (this->open (size) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Framework_Repository"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Framework_Repository"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Framework_Component.inl b/ACE/ace/Framework_Component.inl index 6e6146114f7..2c3c2130a53 100644 --- a/ACE/ace/Framework_Component.inl +++ b/ACE/ace/Framework_Component.inl @@ -12,8 +12,8 @@ ACE_Framework_Component::ACE_Framework_Component (void *_this, const ACE_TCHAR *dll_name, const ACE_TCHAR *name) : this_ (_this), - dll_name_ (ACE::strnew (dll_name ? dll_name : ACE_LIB_TEXT (""))), - name_ (ACE::strnew (name ? name : ACE_LIB_TEXT (""))) + dll_name_ (ACE::strnew (dll_name ? dll_name : ACE_TEXT (""))), + name_ (ACE::strnew (name ? name : ACE_TEXT (""))) { ACE_TRACE ("ACE_Framework_Component::ctor"); } diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index 8ce80c0ceae..97358b7f834 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -56,10 +56,10 @@ ACE_Future_Rep<T>::dump (void) const (int) this->ref_count_)); ACE_DEBUG ((LM_INFO,"value_: \n")); if (this->value_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (NON-NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NON-NULL)\n"))); else //FUZZ: disable check_for_NULL - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (NULL)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (NULL)\n"))); //FUZZ: enable check_for_NULL ACE_DEBUG ((LM_INFO,"value_ready_: \n")); diff --git a/ACE/ace/Get_Opt.cpp b/ACE/ace/Get_Opt.cpp index 7377d48ef4f..7c8175f5575 100644 --- a/ACE/ace/Get_Opt.cpp +++ b/ACE/ace/Get_Opt.cpp @@ -117,12 +117,12 @@ ACE_Get_Opt::ACE_Get_Opt (int argc, ACE_TRACE ("ACE_Get_Opt::ACE_Get_Opt"); ACE_NEW (this->optstring_, ACE_TString (optstring)); - ACE_NEW (this->last_option_, ACE_TString (ACE_LIB_TEXT (""))); + ACE_NEW (this->last_option_, ACE_TString (ACE_TEXT (""))); // First check to see if POSIXLY_CORRECT was set. // Win32 is the only platform capable of wide-char env var. #if defined (ACE_WIN32) - const ACE_TCHAR *env_check = ACE_LIB_TEXT ("POSIXLY_CORRECT"); + const ACE_TCHAR *env_check = ACE_TEXT ("POSIXLY_CORRECT"); #else const char *env_check = "POSIXLY_CORRECT"; #endif @@ -281,7 +281,7 @@ ACE_Get_Opt::long_option_i (void) // one and it wasn't exact. if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: option `%s' is ambiguous\n"), + ACE_TEXT ("%s: option `%s' is ambiguous\n"), this->argv_[0], this->argv_[this->optind])); this->nextchar_ = 0; this->optind++; @@ -307,8 +307,8 @@ ACE_Get_Opt::long_option_i (void) if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: long option `--%s' doesn't allow ") - ACE_LIB_TEXT ("an argument\n"), + ACE_TEXT ("%s: long option `--%s' doesn't allow ") + ACE_TEXT ("an argument\n"), this->argv_[0], pfound->name_)); // The spec doesn't cover this, so we keep going and the program // doesn't know we ignored an argument if opt_err is off!!! @@ -327,8 +327,8 @@ ACE_Get_Opt::long_option_i (void) // All out of elements, so we have to punt... if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: long option '--%s' requires ") - ACE_LIB_TEXT ("an argument\n"), + ACE_TEXT ("%s: long option '--%s' requires ") + ACE_TEXT ("an argument\n"), this->argv_[0], pfound->name_)); this->nextchar_ = 0; this->optopt_ = pfound->val_; // Remember matching short equiv @@ -351,7 +351,7 @@ ACE_Get_Opt::long_option_i (void) // this could happen) it's an error. if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: illegal long option '--%s'\n"), + ACE_TEXT ("%s: illegal long option '--%s'\n"), this->argv_[0], this->nextchar_)); this->nextchar_ = 0; this->optind++; @@ -382,7 +382,7 @@ ACE_Get_Opt::short_option_i (void) { if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: illegal short option -- %c\n"), + ACE_TEXT ("%s: illegal short option -- %c\n"), this->argv_[0], opt)); return '?'; } @@ -423,8 +423,8 @@ ACE_Get_Opt::short_option_i (void) // Ran out of arguments before finding required argument. if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%s: short option requires ") - ACE_LIB_TEXT ("an argument -- %c\n"), + ACE_TEXT ("%s: short option requires ") + ACE_TEXT ("an argument -- %c\n"), this->argv_[0], opt)); opt = this->has_colon_ ? ':' : '?'; } @@ -508,9 +508,9 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' takes ") - ACE_LIB_TEXT ("optional argument; adding %s ") - ACE_LIB_TEXT ("requires ARG_OPTIONAL\n"), + ACE_TEXT ("Existing short option '%c' takes ") + ACE_TEXT ("optional argument; adding %s ") + ACE_TEXT ("requires ARG_OPTIONAL\n"), short_option, name)); return -1; } @@ -521,9 +521,9 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' requires ") - ACE_LIB_TEXT ("an argument; adding %s ") - ACE_LIB_TEXT ("requires ARG_REQUIRED\n"), + ACE_TEXT ("Existing short option '%c' requires ") + ACE_TEXT ("an argument; adding %s ") + ACE_TEXT ("requires ARG_REQUIRED\n"), short_option, name)); return -1; } @@ -533,9 +533,9 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, if (this->opterr) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Existing short option '%c' does not ") - ACE_LIB_TEXT ("accept an argument; adding %s ") - ACE_LIB_TEXT ("requires NO_ARG\n"), + ACE_TEXT ("Existing short option '%c' does not ") + ACE_TEXT ("accept an argument; adding %s ") + ACE_TEXT ("requires NO_ARG\n"), short_option, name)); return -1; } @@ -545,9 +545,9 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, // Didn't find short option, so add it... *this->optstring_ += (ACE_TCHAR) short_option; if (has_arg == ARG_REQUIRED) - *this->optstring_ += ACE_LIB_TEXT (":"); + *this->optstring_ += ACE_TEXT (":"); else if (has_arg == ARG_OPTIONAL) - *this->optstring_ += ACE_LIB_TEXT ("::"); + *this->optstring_ += ACE_TEXT ("::"); } } @@ -564,7 +564,7 @@ ACE_Get_Opt::long_option (const ACE_TCHAR *name, { delete option; ACE_ERROR_RETURN - ((LM_ERROR, ACE_LIB_TEXT ("Could not add long option to array.\n")), + ((LM_ERROR, ACE_TEXT ("Could not add long option to array.\n")), -1); } return 0; @@ -598,14 +598,14 @@ ACE_Get_Opt::dump (void) const ACE_TRACE ("ACE_Get_Opt::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") - ACE_LIB_TEXT ("opstring_ = %s\n") - ACE_LIB_TEXT ("long_only_ = %d\n") - ACE_LIB_TEXT ("has_colon_ = %d\n") - ACE_LIB_TEXT ("last_option_ = %s\n") - ACE_LIB_TEXT ("nextchar_ = %s\n") - ACE_LIB_TEXT ("optopt_ = %c\n") - ACE_LIB_TEXT ("ordering_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") + ACE_TEXT ("opstring_ = %s\n") + ACE_TEXT ("long_only_ = %d\n") + ACE_TEXT ("has_colon_ = %d\n") + ACE_TEXT ("last_option_ = %s\n") + ACE_TEXT ("nextchar_ = %s\n") + ACE_TEXT ("optopt_ = %c\n") + ACE_TEXT ("ordering_ = %d\n"), this->optstring_->c_str (), this->long_only_, this->has_colon_, @@ -618,10 +618,10 @@ ACE_Get_Opt::dump (void) const size_t size = this->long_opts_.size (); for (u_int i = 0; i < size ; ++i) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n") - ACE_LIB_TEXT ("long_option name_ = %s\n") - ACE_LIB_TEXT ("has_arg_ = %d\n") - ACE_LIB_TEXT ("val_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n") + ACE_TEXT ("long_option name_ = %s\n") + ACE_TEXT ("has_arg_ = %d\n") + ACE_TEXT ("val_ = %d\n"), this->long_opts_[i]->name_, this->long_opts_[i]->has_arg_, this->long_opts_[i]->val_)); @@ -688,7 +688,7 @@ ACE_Get_Opt::permute (void) if (this->optind != this->argc_ && ACE_OS::strcmp (this->argv_[this->optind], - ACE_LIB_TEXT ("--")) == 0) + ACE_TEXT ("--")) == 0) { // We found the marker for the end of the options. this->optind++; diff --git a/ACE/ace/Get_Opt.h b/ACE/ace/Get_Opt.h index 73a18f6a051..990b656202a 100644 --- a/ACE/ace/Get_Opt.h +++ b/ACE/ace/Get_Opt.h @@ -171,7 +171,7 @@ public: */ ACE_Get_Opt (int argc, ACE_TCHAR **argv, - const ACE_TCHAR *optstring = ACE_LIB_TEXT (""), + const ACE_TCHAR *optstring = ACE_TEXT (""), int skip_args = 1, int report_errors = 0, int ordering = PERMUTE_ARGS, diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 5ed4b40bd61..2781ddfe2df 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -31,8 +31,8 @@ #include "ace/Assert.h" // For ACE_ASSERT // Start Global Macros -# define ACE_BEGIN_DUMP ACE_LIB_TEXT ("\n====\n(%P|%t|%x)\n") -# define ACE_END_DUMP ACE_LIB_TEXT ("====\n") +# define ACE_BEGIN_DUMP ACE_TEXT ("\n====\n(%P|%t|%x)\n") +# define ACE_END_DUMP ACE_TEXT ("====\n") # if defined (ACE_NDEBUG) # define ACE_DB(X) diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index bd60ebd2356..d9c72e30be1 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -30,8 +30,8 @@ ACE_Guard<ACE_LOCK>::dump (void) const // ACE_TRACE ("ACE_Guard<ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_ = %x\n"), this->lock_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_ = %x\n"), this->lock_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Handle_Set.cpp b/ACE/ace/Handle_Set.cpp index 70952568586..05a85cb338a 100644 --- a/ACE/ace/Handle_Set.cpp +++ b/ACE/ace/Handle_Set.cpp @@ -44,20 +44,20 @@ ACE_Handle_Set::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_handle_ = %d"), this->max_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n[ "))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_handle_ = %d"), this->max_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n[ "))); #if defined (ACE_WIN32) for (size_t i = 0; i < (size_t) this->mask_.fd_count + 1; i++) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" %x "), this->mask_.fd_array[i])); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %x "), this->mask_.fd_array[i])); #else /* !ACE_WIN32 */ for (ACE_HANDLE i = 0; i < this->max_handle_ + 1; i++) if (this->is_set (i)) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" %d "), i)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %d "), i)); #endif /* ACE_WIN32 */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -269,12 +269,12 @@ ACE_Handle_Set_Iterator::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined(ACE_WIN32) || !defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandle_index_ = %d"), this->handle_index_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_index_ = %d"), this->handle_index_)); #elif defined(ACE_HAS_BIG_FD_SET) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_max_ = %d"), this->word_max_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_val_ = %d"), this->word_val_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_max_ = %d"), this->word_max_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_val_ = %d"), this->word_val_)); #endif - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nword_num_ = %d"), this->word_num_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nword_num_ = %d"), this->word_num_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Hash_Map_Manager_T.cpp b/ACE/ace/Hash_Map_Manager_T.cpp index 74473305067..3119c109cd2 100644 --- a/ACE/ace/Hash_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Map_Manager_T.cpp @@ -69,8 +69,8 @@ ACE_Hash_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("prev_ = %d"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -80,8 +80,8 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->table_allocator_->dump (); this->entry_allocator_->dump (); this->lock_.dump (); @@ -387,8 +387,8 @@ ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>: ACE_TRACE ("ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -461,8 +461,8 @@ ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_ ACE_TRACE ("ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ACE/ace/Hash_Map_Manager_T.inl b/ACE/ace/Hash_Map_Manager_T.inl index bd14bd25c26..1f515e58603 100644 --- a/ACE/ace/Hash_Map_Manager_T.inl +++ b/ACE/ace/Hash_Map_Manager_T.inl @@ -17,7 +17,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (size, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE @@ -30,7 +30,7 @@ ACE_Hash_Map_Manager_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::ACE_H cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Map_Manager_Ex\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.cpp b/ACE/ace/Hash_Multi_Map_Manager_T.cpp index 24cb2c8d3ea..34e8b0406be 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.cpp +++ b/ACE/ace/Hash_Multi_Map_Manager_T.cpp @@ -72,8 +72,8 @@ ACE_Hash_Multi_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("prev_ = %d"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -83,8 +83,8 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::du { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->table_allocator_->dump (); this->entry_allocator_->dump (); this->lock_.dump (); @@ -462,8 +462,8 @@ ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOC ACE_TRACE ("ACE_Hash_Multi_Map_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -536,8 +536,8 @@ ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, A ACE_TRACE ("ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("index_ = %d "), this->index_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("index_ = %d "), this->index_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %x"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.inl b/ACE/ace/Hash_Multi_Map_Manager_T.inl index 4b57df90b15..f0cbcabe599 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.inl +++ b/ACE/ace/Hash_Multi_Map_Manager_T.inl @@ -17,7 +17,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC cur_size_ (0) { if (this->open (size, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE @@ -30,7 +30,7 @@ ACE_Hash_Multi_Map_Manager<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK>::AC cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, table_alloc, entry_alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Hash_Multi_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index 02d26d95254..f71b7ebc7d7 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -91,14 +91,14 @@ ACE_High_Res_Timer::get_cpuinfo (void) int supported = 0; #endif /* __alpha__ */ - FILE *cpuinfo = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/cpuinfo"), - ACE_LIB_TEXT ("r")); + FILE *cpuinfo = ACE_OS::fopen (ACE_TEXT ("/proc/cpuinfo"), + ACE_TEXT ("r")); if (cpuinfo != 0) { char buf[128]; - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nReading /proc/cpuinfo..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nReading /proc/cpuinfo..."))); while (ACE_OS::fgets (buf, sizeof buf, cpuinfo)) { @@ -132,7 +132,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) 5) == 0) { supported = 1; - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" recognized Alpha chip..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" recognized Alpha chip..."))); } } // Pentium CPU model? @@ -147,7 +147,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) || ACE_OS::strcmp (arg, "Pro") == 0) { supported = 1; - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" recognized Pentium Pro/II chip..."))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" recognized Pentium Pro/II chip..."))); } } else if (::sscanf (buf, "cpu MHz : %lf\n", &mhertz) == 1) @@ -164,13 +164,13 @@ ACE_High_Res_Timer::get_cpuinfo (void) if (supported) { scale_factor = (ACE_UINT32) (bmips + 0.5); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" setting the clock scale factor to %u"), scale_factor)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" setting the clock scale factor to %u"), scale_factor)); } #if 0 else { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nThe BogoMIPS metric is not supported on this platform" + ACE_TEXT ("\nThe BogoMIPS metric is not supported on this platform" "\n\tReport the results of the clock calibration and" "\n\tthe contents of /proc/cpuinfo to the ace-users mailing list"))); } @@ -180,7 +180,7 @@ ACE_High_Res_Timer::get_cpuinfo (void) #endif /* __alpha__ */ } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" (done)\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); ACE_OS::fclose (cpuinfo); } @@ -314,24 +314,24 @@ ACE_High_Res_Timer::dump (void) const ACE_TRACE ("ACE_High_Res_Timer::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nglobal_scale_factor_: %u\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nglobal_scale_factor_: %u\n"), global_scale_factor ())); #if defined (ACE_LACKS_LONGLONG_T) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") - ACE_LIB_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") - ACE_LIB_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") - ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), + ACE_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") + ACE_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") + ACE_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") + ACE_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), start_.hi (), start_.lo (), end_.hi (), end_.lo (), total_.hi (), total_.lo (), start_incr_.hi (), start_incr_.lo ())); #else /* ! ACE_LACKS_LONGLONG_T */ ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") - ACE_LIB_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") - ACE_LIB_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") - ACE_LIB_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), + ACE_TEXT (":\nstart_.hi (): %8x; start_.lo (): %8x;\n") + ACE_TEXT ("end_.hi (): %8x; end_.lo (): %8x;\n") + ACE_TEXT ("total_.hi (): %8x; total_.lo (): %8x;\n") + ACE_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"), static_cast<ACE_UINT32> (start_ >> 32), static_cast<ACE_UINT32> (start_ & 0xfffffffful), static_cast<ACE_UINT32> (end_ >> 32), @@ -447,7 +447,7 @@ ACE_High_Res_Timer::print_ave (const ACE_TCHAR *str, { ACE_hrtime_t avg_nsecs = total_nanoseconds / (ACE_UINT32) count; ACE_OS::sprintf (buf, - ACE_LIB_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), + ACE_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), count, total_secs, (extra_nsecs + 500u) / 1000u, @@ -455,7 +455,7 @@ ACE_High_Res_Timer::print_ave (const ACE_TCHAR *str, } else ACE_OS::sprintf (buf, - ACE_LIB_TEXT (" total %3lu.%06lu secs\n"), + ACE_TEXT (" total %3lu.%06lu secs\n"), total_secs, (extra_nsecs + 500lu) / 1000lu); @@ -490,7 +490,7 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, ACE_hrtime_t avg_nsecs = this->total_ / (ACE_UINT32) count; ACE_OS::sprintf (buf, - ACE_LIB_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), + ACE_TEXT (" count = %d, total (secs %lu, usecs %u), avg usecs = %lu\n"), count, total_secs, (extra_nsecs + 500u) / 1000u, @@ -498,7 +498,7 @@ ACE_High_Res_Timer::print_total (const ACE_TCHAR *str, } else ACE_OS::sprintf (buf, - ACE_LIB_TEXT (" total %3lu.%06u secs\n"), + ACE_TEXT (" total %3lu.%06u secs\n"), total_secs, (extra_nsecs + 500u) / 1000u); diff --git a/ACE/ace/High_Res_Timer.h b/ACE/ace/High_Res_Timer.h index 831236f1642..249d38078b9 100644 --- a/ACE/ace/High_Res_Timer.h +++ b/ACE/ace/High_Res_Timer.h @@ -132,7 +132,7 @@ public: * environment variable on CE. */ static int get_env_global_scale_factor (const ACE_TCHAR *env - = ACE_LIB_TEXT ("ACE_SCALE_FACTOR")); + = ACE_TEXT ("ACE_SCALE_FACTOR")); /** * Set (and return, for info) the global scale factor by sleeping diff --git a/ACE/ace/ICMP_Socket.cpp b/ACE/ace/ICMP_Socket.cpp index 2904524d25c..d3d07c80f36 100644 --- a/ACE/ace/ICMP_Socket.cpp +++ b/ACE/ace/ICMP_Socket.cpp @@ -97,10 +97,10 @@ ACE_ICMP_Socket::open (ACE_Addr const & local, { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ACE_ICMP_Socket::open: %p; %s\n"), - ACE_LIB_TEXT ("getprotobyname"), - ACE_LIB_TEXT ("ICMP protocol is not properly configured ") - ACE_LIB_TEXT ("or not supported.")), + ACE_TEXT ("(%P|%t) ACE_ICMP_Socket::open: %p; %s\n"), + ACE_TEXT ("getprotobyname"), + ACE_TEXT ("ICMP protocol is not properly configured ") + ACE_TEXT ("or not supported.")), -1); } proto_number = proto->p_proto; @@ -108,9 +108,9 @@ ACE_ICMP_Socket::open (ACE_Addr const & local, if (proto_number != IPPROTO_ICMP || proto_number != protocol) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ACE::ICMP_Socket::open - ") - ACE_LIB_TEXT ("only IPPROTO_ICMP protocol is ") - ACE_LIB_TEXT ("currently supported.\n")), + ACE_TEXT ("(%P|%t) ACE::ICMP_Socket::open - ") + ACE_TEXT ("only IPPROTO_ICMP protocol is ") + ACE_TEXT ("currently supported.\n")), -1); } diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index 6bb993dafde..d5357b8239a 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -53,18 +53,18 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[], + 1 // sizeof (':'), addr/port sep + 1; // sizeof ('\0'), terminating NUL #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_TCHAR const *format = ACE_LIB_TEXT("%ls:%d"); + ACE_TCHAR const *format = ACE_TEXT("%ls:%d"); #else - ACE_TCHAR const *format = ACE_LIB_TEXT("%s:%d"); + ACE_TCHAR const *format = ACE_TEXT("%s:%d"); #endif /* !ACE_WIN32 && ACE_USES_WCHAR */ #if defined (ACE_HAS_IPV6) - if (ACE_OS::strchr (hoststr, ACE_LIB_TEXT (':')) != 0) + if (ACE_OS::strchr (hoststr, ACE_TEXT (':')) != 0) { total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames # if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - format = ACE_LIB_TEXT("[%ls]:%d"); + format = ACE_TEXT("[%ls]:%d"); # else - format = ACE_LIB_TEXT("[%s]:%d"); + format = ACE_TEXT("[%s]:%d"); # endif /* !ACE_WIN32 && ACE_USES_WCHAR */ } #endif // ACE_HAS_IPV6 @@ -88,7 +88,7 @@ ACE_INET_Addr::dump (void) const ACE_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16]; this->addr_to_string(s, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s"), s)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s"), s)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -465,7 +465,7 @@ ACE_INET_Addr::set (const char port_name[], int address_family = PF_UNSPEC; # if defined (ACE_HAS_IPV6) - if (ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(protocol), ACE_LIB_TEXT ("tcp6")) == 0) + if (ACE_OS::strcmp (ACE_TEXT_CHAR_TO_TCHAR(protocol), ACE_TEXT ("tcp6")) == 0) address_family = AF_INET6; # endif /* ACE_HAS_IPV6 */ @@ -509,7 +509,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, 1, address_family) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), ACE_TEXT_CHAR_TO_TCHAR ((host_name == 0) ? "<unknown>" : host_name))); } @@ -527,7 +527,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, 1, address_family) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"), ACE_TEXT_WCHAR_TO_TCHAR ((host_name == 0) ? ACE_TEXT_WIDE ("<unknown>") : host_name))); @@ -634,8 +634,8 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number, this->reset (); if (this->set (port_number, inet_address) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } // Creates a ACE_INET_Addr from a PORT_NAME and the remote @@ -652,7 +652,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], host_name, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } #if defined (ACE_HAS_WCHAR) @@ -667,7 +667,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], host_name, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); } #endif /* ACE_HAS_WCHAR */ @@ -685,7 +685,7 @@ ACE_INET_Addr::ACE_INET_Addr (const char port_name[], htonl (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); #else ACE_UNUSED_ARG (port_name); ACE_UNUSED_ARG (inet_address); @@ -706,7 +706,7 @@ ACE_INET_Addr::ACE_INET_Addr (const wchar_t port_name[], htonl (inet_address), protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); + ACE_TEXT ("ACE_INET_Addr::ACE_INET_Addr"))); #else ACE_UNUSED_ARG (port_name); ACE_UNUSED_ARG (inet_address); @@ -1139,7 +1139,7 @@ ACE_INET_Addr::get_ip_address (void) const } ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n"))); + ACE_TEXT ("ACE_INET_Addr::get_ip_address: address is a IPv6 address not IPv4\n"))); errno = EAFNOSUPPORT; return 0; } diff --git a/ACE/ace/IO_SAP.cpp b/ACE/ace/IO_SAP.cpp index d65bc34c091..0e3e2ea73dc 100644 --- a/ACE/ace/IO_SAP.cpp +++ b/ACE/ace/IO_SAP.cpp @@ -34,8 +34,8 @@ ACE_IO_SAP::dump (void) const ACE_TRACE ("ACE_IO_SAP::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp index c9118a60772..2b2f6625348 100644 --- a/ACE/ace/IPC_SAP.cpp +++ b/ACE/ace/IPC_SAP.cpp @@ -25,8 +25,8 @@ ACE_IPC_SAP::dump (void) const ACE_TRACE ("ACE_IPC_SAP::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d"), this->pid_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp index a1b210424ea..71f93fdde9c 100644 --- a/ACE/ace/LSOCK.cpp +++ b/ACE/ace/LSOCK.cpp @@ -24,7 +24,7 @@ ACE_LSOCK::dump (void) const ACE_TRACE ("ACE_LSOCK::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("aux_handle_ = %d"), this->aux_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("aux_handle_ = %d"), this->aux_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/LSOCK_CODgram.cpp b/ACE/ace/LSOCK_CODgram.cpp index 17f80b9836f..e89607e06ac 100644 --- a/ACE/ace/LSOCK_CODgram.cpp +++ b/ACE/ace/LSOCK_CODgram.cpp @@ -54,7 +54,7 @@ ACE_LSOCK_CODgram::ACE_LSOCK_CODgram (const ACE_Addr &remote, ACE_TRACE ("ACE_LSOCK_CODgram::ACE_LSOCK_CODgram"); if (this->open (remote, local, protocol_family, protocol) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_LSOCK_CODgram"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_LSOCK_CODgram"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/LSOCK_Connector.cpp b/ACE/ace/LSOCK_Connector.cpp index f495744b1b8..319670f903f 100644 --- a/ACE/ace/LSOCK_Connector.cpp +++ b/ACE/ace/LSOCK_Connector.cpp @@ -22,7 +22,7 @@ ACE_LSOCK_Connector::dump (void) const ACE_TRACE ("ACE_LSOCK_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/LSOCK_Dgram.cpp b/ACE/ace/LSOCK_Dgram.cpp index 3c65d24b88c..268ce44eb36 100644 --- a/ACE/ace/LSOCK_Dgram.cpp +++ b/ACE/ace/LSOCK_Dgram.cpp @@ -62,8 +62,8 @@ ACE_LSOCK_Dgram::ACE_LSOCK_Dgram (const ACE_Addr &local, protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_LSOCK_Dgram"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_LSOCK_Dgram"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 3f6e5c5a237..771536cdf8f 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -74,14 +74,14 @@ ACE_LD_Symbol_Registry::register_symbol (const ACE_TCHAR* symname, int result = symbol_registry_.bind (symname, symaddr); if (result == 1) { - ACE_DEBUG((LM_INFO, ACE_LIB_TEXT ("ACE_LD_Symbol_Registry:") - ACE_LIB_TEXT (" duplicate symbol %s registered\n"), + ACE_DEBUG((LM_INFO, ACE_TEXT ("ACE_LD_Symbol_Registry:") + ACE_TEXT (" duplicate symbol %s registered\n"), ACE_TEXT_ALWAYS_CHAR (symname))); } else if (result == -1) { - ACE_ERROR((LM_ERROR, ACE_LIB_TEXT ("ACE_LD_Symbol_Registry:") - ACE_LIB_TEXT (" failed to register symbol %s\n"), + ACE_ERROR((LM_ERROR, ACE_TEXT ("ACE_LD_Symbol_Registry:") + ACE_TEXT (" failed to register symbol %s\n"), ACE_TEXT_ALWAYS_CHAR (symname))); } @@ -272,8 +272,8 @@ ACE::ldfind (const ACE_TCHAR* filename, #endif /* ACE_WIN32 */ { ACE_ERROR ((LM_WARNING, - ACE_LIB_TEXT ("Warning: improper suffix for a ") - ACE_LIB_TEXT ("shared library on this platform: %s\n"), + ACE_TEXT ("Warning: improper suffix for a ") + ACE_TEXT ("shared library on this platform: %s\n"), s)); } } @@ -320,20 +320,20 @@ ACE::ldfind (const ACE_TCHAR* filename, // First, try matching the filename *without* adding a // prefix. ACE_OS::sprintf (pathname, - ACE_LIB_TEXT ("%s%s%s"), + ACE_TEXT ("%s%s%s"), searchpathname, searchfilename, - has_suffix ? ACE_LIB_TEXT ("") : dll_suffix); + has_suffix ? ACE_TEXT ("") : dll_suffix); if (ACE_OS::access (pathname, F_OK) == 0) return 0; // Second, try matching the filename *with* adding a prefix. ACE_OS::sprintf (pathname, - ACE_LIB_TEXT ("%s%s%s%s"), + ACE_TEXT ("%s%s%s%s"), searchpathname, ACE_DLL_PREFIX, searchfilename, - has_suffix ? ACE_LIB_TEXT ("") : dll_suffix); + has_suffix ? ACE_TEXT ("") : dll_suffix); if (ACE_OS::access (pathname, F_OK) == 0) return 0; } @@ -465,28 +465,28 @@ ACE::ldfind (const ACE_TCHAR* filename, // We need to do it here rather than anywhere else so // that the loop condition will still work. else if (path_entry[0] == '\0') - path_entry = ACE_LIB_TEXT ("."); + path_entry = ACE_TEXT ("."); // First, try matching the filename *without* adding a // prefix. ACE_OS::sprintf (pathname, - ACE_LIB_TEXT ("%s%c%s%s"), + ACE_TEXT ("%s%c%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, searchfilename, - has_suffix ? ACE_LIB_TEXT ("") : dll_suffix); + has_suffix ? ACE_TEXT ("") : dll_suffix); if (ACE_OS::access (pathname, F_OK) == 0) break; // Second, try matching the filename *with* adding a // prefix. ACE_OS::sprintf (pathname, - ACE_LIB_TEXT ("%s%c%s%s%s"), + ACE_TEXT ("%s%c%s%s%s"), path_entry, ACE_DIRECTORY_SEPARATOR_CHAR, ACE_DLL_PREFIX, searchfilename, - has_suffix ? ACE_LIB_TEXT ("") : dll_suffix); + has_suffix ? ACE_TEXT ("") : dll_suffix); if (ACE_OS::access (pathname, F_OK) == 0) break; @@ -549,7 +549,7 @@ ACE::ldname (const ACE_TCHAR *entry_point) ACE_TCHAR[size], 0); - ACE_OS::strcpy (new_name, ACE_LIB_TEXT ("_")); + ACE_OS::strcpy (new_name, ACE_TEXT ("_")); ACE_OS::strcat (new_name, entry_point); return new_name; @@ -629,7 +629,7 @@ ACE::get_temp_dir (ACE_TCHAR *buffer, size_t buffer_len) // Add a trailing slash because we cannot assume there is already one // at the end. And having an extra one should not cause problems. - buffer[len] = ACE_LIB_TEXT ('/'); + buffer[len] = ACE_TEXT ('/'); buffer[len + 1] = 0; result = 0; } diff --git a/ACE/ace/Local_Memory_Pool.cpp b/ACE/ace/Local_Memory_Pool.cpp index 10692afde86..09dbb19000d 100644 --- a/ACE/ace/Local_Memory_Pool.cpp +++ b/ACE/ace/Local_Memory_Pool.cpp @@ -63,7 +63,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes, if (this->allocated_chunks_.insert (cp.get ()) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) insertion into set failed\n")), + ACE_TEXT ("(%P|%t) insertion into set failed\n")), 0); return cp.release (); diff --git a/ACE/ace/Local_Name_Space_T.cpp b/ACE/ace/Local_Name_Space_T.cpp index dbc0121f231..43feaf3fe81 100644 --- a/ACE/ace/Local_Name_Space_T.cpp +++ b/ACE/ace/Local_Name_Space_T.cpp @@ -372,7 +372,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::ACE_Local_Name_Space ( { ACE_TRACE ("ACE_Local_Name_Space::ACE_Local_Name_Space"); if (this->open (scope_in) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Local_Name_Space::ACE_Local_Name_Space"))); } template <ACE_MEM_POOL_1, class ACE_LOCK> @@ -442,7 +442,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) ACE_DIRECTORY_SEPARATOR_STR, length - ACE_OS::strlen (lock_name_for_local_name_space)); ACE_OS::strncat (lock_name_for_local_name_space, - ACE_LIB_TEXT ("name_space_"), + ACE_TEXT ("name_space_"), length - ACE_OS::strlen (lock_name_for_local_name_space)); ACE_OS::strncat (lock_name_for_local_name_space, postfix, @@ -456,11 +456,11 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) ACE_DIRECTORY_SEPARATOR_STR, length - ACE_OS::strlen (lock_name_for_backing_store)); ACE_OS::strncat (lock_name_for_backing_store, - ACE_LIB_TEXT ("backing_store_"), + ACE_TEXT ("backing_store_"), length - ACE_OS::strlen (lock_name_for_backing_store)); ACE_OS::strncat (lock_name_for_backing_store, postfix, - length - ACE_OS::strlen (ACE_LIB_TEXT ("backing_store_"))); + length - ACE_OS::strlen (ACE_TEXT ("backing_store_"))); // Create the allocator with the appropriate options. ACE_NEW_RETURN (this->allocator_, @@ -470,7 +470,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (ACE_LOG_MSG->op_status ()) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Allocator::Allocator\n")), + ACE_TEXT ("Allocator::Allocator\n")), -1); ACE_NEW_RETURN (this->lock_, @@ -481,7 +481,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) // Now check if the backing store has been created successfully if (ACE_OS::access (this->context_file_, F_OK) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("create_manager\n")), + ACE_TEXT ("create_manager\n")), -1); #endif /* ACE_LACKS_ACCESS */ @@ -494,7 +494,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -511,7 +511,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) this->name_space_map_ = (ACE_Name_Space_Map <ALLOCATOR> *) ns_map; if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } else @@ -525,12 +525,12 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::create_manager_i (void) if (this->allocator_->bind (ACE_NAME_SERVER_MAP, ns_map) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("create_manager\n")), -1); + ACE_TEXT ("create_manager\n")), -1); } if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("name_space_map_ = %d, ns_map = %d\n"), + ACE_TEXT ("name_space_map_ = %d, ns_map = %d\n"), this->name_space_map_, ns_map)); } @@ -813,7 +813,7 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const const char *type = map_entry->int_id_.type (); #endif /* ! ACE_NLOGGING */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), ACE_TEXT_CHAR_TO_TCHAR (key), ACE_TEXT_CHAR_TO_TCHAR (value), ACE_TEXT_CHAR_TO_TCHAR (type))); // We need to delete key and value since char_rep allocates // memory for them diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index d8317df464c..17330fe79dd 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -25,11 +25,11 @@ ACE_Tokens::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Tokens::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Tokens::dump:\n") - ACE_LIB_TEXT (" reference_cont_ = %d\n") - ACE_LIB_TEXT (" token_name_ = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") + ACE_TEXT (" reference_cont_ = %d\n") + ACE_TEXT (" token_name_ = %s\n"), reference_count_, token_name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiters_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiters_\n"))); this->waiters_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -84,19 +84,19 @@ ACE_TPQ_Entry::dump (void) const ACE_TRACE ("ACE_TPQ_Entry::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_TPQ_Entry::dump:\n") - ACE_LIB_TEXT (" nesting_level_ = %d\n") - ACE_LIB_TEXT (" client_id_ = %s\n"), + ACE_TEXT ("ACE_TPQ_Entry::dump:\n") + ACE_TEXT (" nesting_level_ = %d\n") + ACE_TEXT (" client_id_ = %s\n"), nesting_level_, client_id_)); if (next_ != 0) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next:.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next:.\n"))); next_->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TPQ_Entry::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Entry::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -126,7 +126,7 @@ ACE_TPQ_Entry::ACE_TPQ_Entry (const ACE_Token_Proxy *new_proxy, // The cast is an attempt to get this to compile (and run, // hopefully) regardless of the type of ACE_thread_t. ACE_OS::sprintf (name, - ACE_LIB_TEXT ("/%s/%u/%lu"), + ACE_TEXT ("/%s/%u/%lu"), host_name, static_cast<u_int> (ACE_OS::getpid ()), *reinterpret_cast<u_long *> (&thread_id)); @@ -191,10 +191,10 @@ ACE_TSS_TPQ_Entry::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_TPQ_Entry::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") - ACE_LIB_TEXT (" client_id_ = %s\n"), - client_id_ == 0 ? ACE_LIB_TEXT ("0") : client_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_TPQ_Entry::dump:\n") + ACE_TEXT (" client_id_ = %s\n"), + client_id_ == 0 ? ACE_TEXT ("0") : client_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_TPQ_ENTRY::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -275,10 +275,10 @@ ACE_TPQ_Iterator::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TPQ_Iterator::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TPQ_Iterator::dump:\n") - ACE_LIB_TEXT (" current_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TPQ_Iterator::dump:\n") + ACE_TEXT (" current_ = %d\n"), (long) this->current_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ and tail_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -289,14 +289,14 @@ ACE_Token_Proxy_Queue::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy_Queue::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump:\n") - ACE_LIB_TEXT (" size_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump:\n") + ACE_TEXT (" size_ = %d\n"), size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ and tail_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ and tail_\n"))); if (this->head_ != 0) this->head_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy_Queue::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -379,7 +379,7 @@ ACE_Token_Proxy_Queue::dequeue (void) if (this->head_ == 0 && this->size_ != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("incorrect size = %d\n"), + ACE_TEXT ("incorrect size = %d\n"), this->size_)); } @@ -453,12 +453,12 @@ ACE_Mutex_Token::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Token::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Mutex_Token::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Mutex_Token::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Mutex_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -708,13 +708,13 @@ ACE_RW_Token::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RW_Token::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_RW_Token::dump:\n") - ACE_LIB_TEXT ("num_writers_ = %d\n"), num_writers_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump:\n") + ACE_TEXT ("num_writers_ = %d\n"), num_writers_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Tokens::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_RW_Token::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_RW_Token::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1090,18 +1090,18 @@ ACE_Token_Proxy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Proxy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy::dump:\n") - ACE_LIB_TEXT (" type = %d\n") - ACE_LIB_TEXT (" ignore_deadlock_ = %d\n") - ACE_LIB_TEXT (" debug_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump:\n") + ACE_TEXT (" type = %d\n") + ACE_TEXT (" ignore_deadlock_ = %d\n") + ACE_TEXT (" debug_ = %d\n"), (int) this->type (), ignore_deadlock_, debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_, and waiter_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_, and waiter_\n"))); if (this->token_ != 0) this->token_->dump (); this->waiter_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Proxy::dump end.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Proxy::dump end.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1115,7 +1115,7 @@ ACE_Token_Proxy::client_id (void) const const ACE_TCHAR *id = temp->client_id (); if (id == 0) - return ACE_LIB_TEXT ("ERROR NO CLIENT ID"); + return ACE_TEXT ("ERROR NO CLIENT ID"); else return id; } @@ -1194,7 +1194,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name, // We must have a name. if (token_name == 0) { - ACE_OS::sprintf (name, ACE_LIB_TEXT ("token %lx"), + ACE_OS::sprintf (name, ACE_TEXT ("token %lx"), reinterpret_cast<long> (this)); token_name = name; } @@ -1207,7 +1207,7 @@ ACE_Token_Proxy::open (const ACE_TCHAR *token_name, if (this->token_ == 0) { errno = ENOMEM; - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Can't allocate mutex")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Can't allocate mutex")), -1); } return 0; @@ -1222,7 +1222,7 @@ ACE_Token_Proxy::acquire (int notify, if (this->token_ == 0) { errno = ENOENT; - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Not open.\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Not open.\n")), -1); } // Make sure no one calls our token_acquired until we have a chance @@ -1252,8 +1252,8 @@ ACE_Token_Proxy::acquire (int notify, case EWOULDBLOCK : if (this->debug_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) waiting for %s, owner is %s, ") - ACE_LIB_TEXT ("total waiters == %d\n"), + ACE_TEXT ("(%t) waiting for %s, owner is %s, ") + ACE_TEXT ("total waiters == %d\n"), this->name (), this->token_->owner_id (), token_->no_of_waiters ())); @@ -1273,8 +1273,8 @@ ACE_Token_Proxy::acquire (int notify, default : waiter_->cond_var_.mutex ().release (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("Token Proxy acquire.")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("Token Proxy acquire.")), -1); } } @@ -1283,7 +1283,7 @@ ACE_Token_Proxy::acquire (int notify, { if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) acquired %s\n"), + ACE_TEXT ("(%t) acquired %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); } @@ -1299,7 +1299,7 @@ ACE_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Not open.\n")), + ACE_TEXT ("Not open.\n")), -1); } @@ -1317,7 +1317,7 @@ ACE_Token_Proxy::renew (int requeue_position, { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Not open.\n")), + ACE_TEXT ("Not open.\n")), -1); } @@ -1330,10 +1330,10 @@ ACE_Token_Proxy::renew (int requeue_position, // check for error if (errno != EWOULDBLOCK) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p renew failed\n"), ACE_LIB_TEXT ("ACE_Token_Proxy")), -1); + ACE_TEXT ("%p renew failed\n"), ACE_TEXT ("ACE_Token_Proxy")), -1); if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renew blocking for %s, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renew blocking for %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1344,7 +1344,7 @@ ACE_Token_Proxy::renew (int requeue_position, // we have the token { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renewed %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s\n"), this->name ())); waiter_->cond_var_.mutex ().release (); return 0; @@ -1379,12 +1379,12 @@ ACE_Token_Proxy::handle_options (ACE_Synch_Options &options, // We come here if a timeout occurs or some serious // ACE_Condition object error. cv.mutex ().release (); - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("condition variable wait") - ACE_LIB_TEXT (" bombed.")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("condition variable wait") + ACE_TEXT (" bombed.")), -1); } if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) unblocking %s.\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) unblocking %s.\n"), this->client_id ())); cv.mutex ().release (); return 0; // operation succeeded @@ -1400,7 +1400,7 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) { errno = ENOENT; if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Must open before releasing.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Must open before releasing.\n"))); ACE_RETURN (-1); } @@ -1409,13 +1409,13 @@ ACE_Token_Proxy::release (ACE_Synch_Options &) // Release failed. this->token_->remove (this->waiter_); if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) %p.\n"), ACE_LIB_TEXT ("release failed"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %p.\n"), ACE_TEXT ("release failed"))); return -1; } else { if (this->debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) released %s, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s, owner is %s\n"), this->name (), token_->owner_id ())); @@ -1515,9 +1515,9 @@ ACE_Token_Name::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Name::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Name::dump:\n") - ACE_LIB_TEXT (" token_name_ = %s\n"), - token_name_ == 0 ? ACE_LIB_TEXT ("no name") : token_name_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Name::dump:\n") + ACE_TEXT (" token_name_ = %s\n"), + token_name_ == 0 ? ACE_TEXT ("no name") : token_name_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index 62f5e2cbfa0..2e27ce4af04 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -74,7 +74,7 @@ ACE_Tokens::dec_reference (void) ACE_TRACE ("ACE_Tokens::dec_reference"); if (this->reference_count_ == 0) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("dec_reference already zero"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("dec_reference already zero"))); return 0; } @@ -128,7 +128,7 @@ ACE_Tokens::owner_id () { ACE_TRACE ("ACE_Tokens::owner_id"); if (this->owner () == 0) - return ACE_LIB_TEXT ("no owner"); + return ACE_TEXT ("no owner"); else return this->owner ()->client_id (); } @@ -223,7 +223,7 @@ ACE_Token_Name::name (const ACE_TCHAR *new_name) ACE_TRACE ("ACE_Token_Name::name"); if (new_name == 0) - new_name = ACE_LIB_TEXT ("no name"); + new_name = ACE_TEXT ("no name"); size_t n = ACE_OS::strlen (new_name) + 1; diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 549598832c7..bc35a62c802 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -523,7 +523,7 @@ ACE_Log_Msg::close (void) (void *)NULL ) != 0 ) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE_Log_Msg::close failed to ACE_Thread::setspecific to NULL\n"))); + ACE_TEXT ("(%P|%t) ACE_Log_Msg::close failed to ACE_Thread::setspecific to NULL\n"))); } } @@ -810,7 +810,7 @@ ACE_Log_Msg::open (const ACE_TCHAR *prog_name, // Stop heap checking, block will be freed by the destructor. ACE_NO_HEAP_CHECK; ACE_ALLOCATOR_RETURN (ACE_Log_Msg::program_name_, - ACE_OS::strdup (ACE_LIB_TEXT ("<unknown>")), + ACE_OS::strdup (ACE_TEXT ("<unknown>")), -1); } @@ -1046,7 +1046,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // compile time. Instead, do a quick check now; if we get a -1 return, // the platform doesn't support the length-limiting capability. ACE_TCHAR test[2]; - bool can_check = ACE_OS::snprintf (test, 1, ACE_LIB_TEXT ("x")) != -1; + bool can_check = ACE_OS::snprintf (test, 1, ACE_TEXT ("x")) != -1; bool abort_prog = false; int exit_value = 0; @@ -1120,7 +1120,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // equivalent sprintf specifier, and run the new format spec // through sprintf, adding it to the bp string. - const ACE_TCHAR *abort_str = ACE_LIB_TEXT ("Aborting..."); + const ACE_TCHAR *abort_str = ACE_TEXT ("Aborting..."); const ACE_TCHAR *start_format = format_str; ACE_TCHAR format[128]; // Converted format string ACE_TCHAR *fp; // Current format pointer @@ -1175,14 +1175,14 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case '*': wp = va_arg (argp, int); - ACE_OS::sprintf (fp, ACE_LIB_TEXT ("%d"), wp); + ACE_OS::sprintf (fp, ACE_TEXT ("%d"), wp); fp += ACE_OS::strlen (fp); done = 0; break; case 'A': // ACE_timer_t { - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("f")); + ACE_OS::strcpy (fp, ACE_TEXT ("f")); double value = va_arg (argp, double); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, value); @@ -1203,7 +1203,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case 'l': // Source file line number - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("d")); + ACE_OS::strcpy (fp, ACE_TEXT ("d")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, @@ -1216,44 +1216,44 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'N': // Source file name #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, this->file () ? ACE_TEXT_CHAR_TO_TCHAR (this->file ()) - : ACE_LIB_TEXT ("<unknown file>")); + : ACE_TEXT ("<unknown file>")); else this_len = ACE_OS::sprintf (bp, format, this->file () ? ACE_TEXT_CHAR_TO_TCHAR (this->file ()) - : ACE_LIB_TEXT ("<unknown file>")); + : ACE_TEXT ("<unknown file>")); ACE_UPDATE_COUNT (bspace, this_len); break; case 'n': // Program name #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else /* ACE_WIN32 && ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, ACE_Log_Msg::program_name_ ? ACE_Log_Msg::program_name_ : - ACE_LIB_TEXT ("<unknown>")); + ACE_TEXT ("<unknown>")); else this_len = ACE_OS::sprintf (bp, format, ACE_Log_Msg::program_name_ ? ACE_Log_Msg::program_name_ : - ACE_LIB_TEXT ("<unknown>")); + ACE_TEXT ("<unknown>")); ACE_UPDATE_COUNT (bspace, this_len); break; case 'P': // Process ID - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("d")); + ACE_OS::strcpy (fp, ACE_TEXT ("d")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1276,9 +1276,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #endif #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls: %ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls: %ls")); #else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s: %s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s: %s")); #endif if (can_check) this_len = ACE_OS::snprintf @@ -1321,7 +1321,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { const ACE_TCHAR *message = ACE::sock_error (errno); - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s: %s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s: %s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1335,7 +1335,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } else { - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s: %s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s: %s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1357,9 +1357,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'M': // Print the name of the priority of the message. #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif if (can_check) this_len = ACE_OS::snprintf @@ -1385,9 +1385,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #endif #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else /* ACE_WIN32 && ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif if (can_check) this_len = ACE_OS::snprintf @@ -1428,7 +1428,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { const ACE_TCHAR *message = ACE::sock_error (errno); - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, message); @@ -1437,7 +1437,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } else { - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, lpMsgBuf); @@ -1455,7 +1455,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'R': // Format the return status of the operation. this->op_status (va_arg (argp, int)); - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("d")); + ACE_OS::strcpy (fp, ACE_TEXT ("d")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, this->op_status ()); @@ -1539,7 +1539,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #if defined (ACE_HAS_SYS_SIGLIST) if (sig >= 0 && sig < ACE_NSIG) { - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, _sys_siglist[sig]); @@ -1552,18 +1552,18 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, if (can_check) this_len = ACE_OS::snprintf (bp, bspace, - ACE_LIB_TEXT("<unknown signal> %d"), sig); + ACE_TEXT("<unknown signal> %d"), sig); else this_len = ACE_OS::sprintf - (bp, ACE_LIB_TEXT ("<unknown signal> %d"), sig); + (bp, ACE_TEXT ("<unknown signal> %d"), sig); } #else if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, ACE_LIB_TEXT ("signal %d"), sig); + (bp, bspace, ACE_TEXT ("signal %d"), sig); else this_len = ACE_OS::sprintf - (bp, ACE_LIB_TEXT ("signal %d"), sig); + (bp, ACE_TEXT ("signal %d"), sig); #endif /* ACE_HAS_SYS_SIGLIST */ ACE_UPDATE_COUNT (bspace, this_len); break; @@ -1576,9 +1576,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, ACE::timestamp (day_and_time, sizeof day_and_time); #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif if (can_check) this_len = ACE_OS::snprintf @@ -1593,7 +1593,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // hour:minute:sec:usec format. { ACE_TCHAR day_and_time[35]; - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1608,7 +1608,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 't': // Format thread id. #if defined (ACE_WIN32) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + ACE_OS::strcpy (fp, ACE_TEXT ("u")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, @@ -1619,7 +1619,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, format, static_cast <unsigned> (ACE_Thread::self ())); #elif defined (DIGITAL_UNIX) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + ACE_OS::strcpy (fp, ACE_TEXT ("u")); { int id = # if defined (ACE_HAS_THREADS) @@ -1640,7 +1640,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, # if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + ACE_OS::strcpy (fp, ACE_TEXT ("u")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, t_id); else @@ -1651,7 +1651,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, // is an integral type or a pointer type. FreeBSD uses // a pointer type, but doesn't have a _np function to // get an integral type, like the OSes above. - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("lu")); + ACE_OS::strcpy (fp, ACE_TEXT ("lu")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, (unsigned long)t_id); @@ -1668,17 +1668,17 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) wchar_t *str = va_arg (argp, wchar_t *); - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); #else /* ACE_WIN32 && ACE_USES_WCHAR */ ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *); - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, str ? str : ACE_LIB_TEXT ("(null)")); + (bp, bspace, format, str ? str : ACE_TEXT ("(null)")); else this_len = ACE_OS::sprintf - (bp, format, str ? str : ACE_LIB_TEXT ("(null)")); + (bp, format, str ? str : ACE_TEXT ("(null)")); ACE_UPDATE_COUNT (bspace, this_len); } break; @@ -1687,16 +1687,16 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, { ACE_TCHAR *cstr = va_arg (argp, ACE_TCHAR *); #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); + ACE_OS::strcpy (fp, ACE_TEXT ("S")); #else /* ACE_WIN32 && ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ if (can_check) this_len = ACE_OS::snprintf - (bp, bspace, format, cstr ? cstr : ACE_LIB_TEXT ("(null)")); + (bp, bspace, format, cstr ? cstr : ACE_TEXT ("(null)")); else this_len = ACE_OS::sprintf - (bp, format, cstr ? cstr : ACE_LIB_TEXT ("(null)")); + (bp, format, cstr ? cstr : ACE_TEXT ("(null)")); ACE_UPDATE_COUNT (bspace, this_len); } break; @@ -1706,15 +1706,15 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, #if defined (ACE_HAS_WCHAR) wchar_t *wchar_str = va_arg (argp, wchar_t *); # if defined (HPUX) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); + ACE_OS::strcpy (fp, ACE_TEXT ("S")); # elif defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); + ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ # else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); # endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf @@ -1730,9 +1730,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'w': // Wide character #if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("c")); + ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); + ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -1742,9 +1742,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, (bp, format, va_arg (argp, int)); #elif defined (ACE_USES_WCHAR) # if defined (HPUX) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); + ACE_OS::strcpy (fp, ACE_TEXT ("C")); # else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("lc")); + ACE_OS::strcpy (fp, ACE_TEXT ("lc")); # endif /* HPUX */ if (can_check) this_len = ACE_OS::snprintf @@ -1753,7 +1753,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, this_len = ACE_OS::sprintf (bp, format, va_arg (argp, wint_t)); #else /* ACE_WIN32 */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + ACE_OS::strcpy (fp, ACE_TEXT ("u")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, int)); @@ -1772,18 +1772,18 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, static_cast<wchar_t> (va_arg (argp, int)); #if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("c")); + ACE_OS::strcpy (fp, ACE_TEXT ("c")); # else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); + ACE_OS::strcpy (fp, ACE_TEXT ("C")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_USES_WCHAR) # if defined (HPUX) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); + ACE_OS::strcpy (fp, ACE_TEXT ("C")); # else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("lc")); + ACE_OS::strcpy (fp, ACE_TEXT ("lc")); # endif /* HPUX */ #else /* ACE_WIN32 */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("u")); + ACE_OS::strcpy (fp, ACE_TEXT ("u")); #endif /* ACE_WIN32 */ if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, wtchar); @@ -1819,15 +1819,15 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } #if defined (ACE_WIN32) # if defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("s")); + ACE_OS::strcpy (fp, ACE_TEXT ("s")); # else /* ACE_USES_WCHAR */ - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); + ACE_OS::strcpy (fp, ACE_TEXT ("S")); # endif /* ACE_USES_WCHAR */ #elif defined (ACE_HAS_WCHAR) # if defined (HPUX) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("S")); + ACE_OS::strcpy (fp, ACE_TEXT ("S")); # else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("ls")); + ACE_OS::strcpy (fp, ACE_TEXT ("ls")); # endif /* HPUX */ #endif /* ACE_WIN32 / ACE_HAS_WCHAR */ if (can_check) @@ -1845,9 +1845,9 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case 'c': #if defined (ACE_WIN32) && defined (ACE_USES_WCHAR) - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("C")); + ACE_OS::strcpy (fp, ACE_TEXT ("C")); #else - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("c")); + ACE_OS::strcpy (fp, ACE_TEXT ("c")); #endif /* ACE_WIN32 && ACE_USES_WCHAR */ if (can_check) this_len = ACE_OS::snprintf @@ -1972,7 +1972,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, case ':': { // Assume a 32 bit time_t and change if needed. - const ACE_TCHAR *fmt = ACE_LIB_TEXT ("%d"); + const ACE_TCHAR *fmt = ACE_TEXT ("%d"); if (sizeof (time_t) == 8) fmt = ACE_INT64_FORMAT_SPECIFIER; @@ -1990,7 +1990,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, break; case '@': - ACE_OS::strcpy (fp, ACE_LIB_TEXT ("p")); + ACE_OS::strcpy (fp, ACE_TEXT ("p")); if (can_check) this_len = ACE_OS::snprintf (bp, bspace, format, va_arg (argp, void*)); @@ -2239,25 +2239,25 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority, if (text) sz = ACE_OS::sprintf (msg_buf, - ACE_LIB_TEXT ("%s - "), + ACE_TEXT ("%s - "), text); sz += ACE_OS::sprintf (msg_buf + sz, - ACE_LIB_TEXT ("HEXDUMP ") + ACE_TEXT ("HEXDUMP ") ACE_SIZE_T_FORMAT_SPECIFIER - ACE_LIB_TEXT (" bytes"), + ACE_TEXT (" bytes"), size); if (len < size) ACE_OS::sprintf (msg_buf + sz, - ACE_LIB_TEXT (" (showing first ") + ACE_TEXT (" (showing first ") ACE_SIZE_T_FORMAT_SPECIFIER - ACE_LIB_TEXT (" bytes)"), + ACE_TEXT (" bytes)"), len); // Now print out the formatted buffer. this->log (log_priority, - ACE_LIB_TEXT ("%s\n%s"), + ACE_TEXT ("%s\n%s"), msg_buf, buf); @@ -2305,35 +2305,35 @@ ACE_Log_Msg::dump (void) const ACE_TRACE ("ACE_Log_Msg::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("status_ = %d\n"), this->status_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_ = %C\n"), this->file_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_ = %s\n"), this->msg_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nrestart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nostream_ = %@\n"), this->ostream_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_callback_ = %@\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("status_ = %d\n"), this->status_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nerrnum_ = %d\n"), this->errnum_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlinenum_ = %d\n"), this->linenum_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_ = %C\n"), this->file_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_ = %s\n"), this->msg_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nrestart_ = %d\n"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nostream_ = %@\n"), this->ostream_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_callback_ = %@\n"), this->msg_callback_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprogram_name_ = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprogram_name_ = %s\n"), this->program_name_ ? this->program_name_ - : ACE_LIB_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlocal_host_ = %s\n"), + : ACE_TEXT ("<unknown>"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlocal_host_ = %s\n"), this->local_host_ ? this->local_host_ - : ACE_LIB_TEXT ("<unknown>"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %d\n"), this->getpid ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = 0x%x\n"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntrace_depth_ = %d\n"), + : ACE_TEXT ("<unknown>"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %d\n"), this->getpid ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = 0x%x\n"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_depth_ = %d\n"), this->trace_depth_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntrace_active_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntrace_active_ = %d\n"), this->trace_active_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntracing_enabled_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntracing_enabled_ = %d\n"), this->tracing_enabled_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npriority_mask_ = 0x%x\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npriority_mask_ = 0x%x\n"), this->priority_mask_)); if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_state_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d\n"), this->thr_desc_->state ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_off_ = %d\n"), this->msg_off_)); // Be sure that there is a message_queue_, with multiple threads. ACE_MT (ACE_Log_Msg_Manager::init_backend ()); diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp index a78bf9c58e0..e22170c01dc 100644 --- a/ACE/ace/Log_Msg_NT_Event_Log.cpp +++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp @@ -46,7 +46,7 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key) // program name. ACE_TCHAR reg_key [MAXPATHLEN]; ACE_OS::strcpy (reg_key, - ACE_LIB_TEXT ("SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\")); + ACE_TEXT ("SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\")); size_t reg_key_length = ACE_OS::strlen(reg_key); ACE_OS::strncat (reg_key, event_source_name, @@ -61,13 +61,13 @@ ACE_Log_Msg_NT_Event_Log::open (const ACE_TCHAR *logger_key) &hkey); DWORD flags = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE; ACE_TEXT_RegSetValueEx (hkey, - ACE_LIB_TEXT ("TypesSupported"), + ACE_TEXT ("TypesSupported"), 0, REG_DWORD, (LPBYTE) &flags, sizeof (DWORD)); ACE_TEXT_RegSetValueEx (hkey, - ACE_LIB_TEXT ("EventMessageFile"), + ACE_TEXT ("EventMessageFile"), 0, REG_SZ, (LPBYTE) msg_file, diff --git a/ACE/ace/Log_Msg_UNIX_Syslog.cpp b/ACE/ace/Log_Msg_UNIX_Syslog.cpp index 265c24db71e..dba78bcd571 100644 --- a/ACE/ace/Log_Msg_UNIX_Syslog.cpp +++ b/ACE/ace/Log_Msg_UNIX_Syslog.cpp @@ -94,11 +94,11 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record) ACE_TCHAR *strtokp = 0; for (ACE_TCHAR *line = ACE_OS::strtok_r (message, - ACE_LIB_TEXT ("\n"), + ACE_TEXT ("\n"), &strtokp); line != 0; line = ACE_OS::strtok_r (0, - ACE_LIB_TEXT ("\n"), + ACE_TEXT ("\n"), &strtokp)) { // Format the message line. Note that the processing for @@ -112,7 +112,7 @@ ACE_Log_Msg_UNIX_Syslog::log (ACE_Log_Record &log_record) { ACE_TCHAR date_and_time[35]; if (0 == ACE::timestamp (date_and_time, sizeof (date_and_time), 1)) - ACE_OS::strcpy (date_and_time, ACE_LIB_TEXT ("<time error>")); + ACE_OS::strcpy (date_and_time, ACE_TEXT ("<time error>")); const ACE_TCHAR *prio_name = ACE_Log_Record::priority_name(ACE_Log_Priority(log_record.type())); syslog (syslog_priority, diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp index e08f7c4ed7a..f790cf7d24c 100644 --- a/ACE/ace/Log_Record.cpp +++ b/ACE/ace/Log_Record.cpp @@ -32,38 +32,38 @@ namespace // Symbolic names for the <ACE_Log_Priority> enumerators. ACE_TCHAR const * ace_priority_names[] = { - ACE_LIB_TEXT ("LM_SHUTDOWN"), - ACE_LIB_TEXT ("LM_TRACE"), - ACE_LIB_TEXT ("LM_DEBUG"), - ACE_LIB_TEXT ("LM_INFO"), - ACE_LIB_TEXT ("LM_NOTICE"), - ACE_LIB_TEXT ("LM_WARNING"), - ACE_LIB_TEXT ("LM_STARTUP"), - ACE_LIB_TEXT ("LM_ERROR"), - ACE_LIB_TEXT ("LM_CRITICAL"), - ACE_LIB_TEXT ("LM_ALERT"), - ACE_LIB_TEXT ("LM_EMERGENCY"), - ACE_LIB_TEXT ("LM_UNK(04000)"), - ACE_LIB_TEXT ("LM_UNK(010000)"), - ACE_LIB_TEXT ("LM_UNK(020000)"), - ACE_LIB_TEXT ("LM_UNK(040000)"), - ACE_LIB_TEXT ("LM_UNK(0100000)"), - ACE_LIB_TEXT ("LM_UNK(0200000)"), - ACE_LIB_TEXT ("LM_UNK(0400000)"), - ACE_LIB_TEXT ("LM_UNK(01000000)"), - ACE_LIB_TEXT ("LM_UNK(02000000)"), - ACE_LIB_TEXT ("LM_UNK(04000000)"), - ACE_LIB_TEXT ("LM_UNK(010000000)"), - ACE_LIB_TEXT ("LM_UNK(020000000)"), - ACE_LIB_TEXT ("LM_UNK(040000000)"), - ACE_LIB_TEXT ("LM_UNK(0100000000)"), - ACE_LIB_TEXT ("LM_UNK(0200000000)"), - ACE_LIB_TEXT ("LM_UNK(0400000000)"), - ACE_LIB_TEXT ("LM_UNK(01000000000)"), - ACE_LIB_TEXT ("LM_UNK(02000000000)"), - ACE_LIB_TEXT ("LM_UNK(04000000000)"), - ACE_LIB_TEXT ("LM_UNK(010000000000)"), - ACE_LIB_TEXT ("LM_UNK(020000000000)") + ACE_TEXT ("LM_SHUTDOWN"), + ACE_TEXT ("LM_TRACE"), + ACE_TEXT ("LM_DEBUG"), + ACE_TEXT ("LM_INFO"), + ACE_TEXT ("LM_NOTICE"), + ACE_TEXT ("LM_WARNING"), + ACE_TEXT ("LM_STARTUP"), + ACE_TEXT ("LM_ERROR"), + ACE_TEXT ("LM_CRITICAL"), + ACE_TEXT ("LM_ALERT"), + ACE_TEXT ("LM_EMERGENCY"), + ACE_TEXT ("LM_UNK(04000)"), + ACE_TEXT ("LM_UNK(010000)"), + ACE_TEXT ("LM_UNK(020000)"), + ACE_TEXT ("LM_UNK(040000)"), + ACE_TEXT ("LM_UNK(0100000)"), + ACE_TEXT ("LM_UNK(0200000)"), + ACE_TEXT ("LM_UNK(0400000)"), + ACE_TEXT ("LM_UNK(01000000)"), + ACE_TEXT ("LM_UNK(02000000)"), + ACE_TEXT ("LM_UNK(04000000)"), + ACE_TEXT ("LM_UNK(010000000)"), + ACE_TEXT ("LM_UNK(020000000)"), + ACE_TEXT ("LM_UNK(040000000)"), + ACE_TEXT ("LM_UNK(0100000000)"), + ACE_TEXT ("LM_UNK(0200000000)"), + ACE_TEXT ("LM_UNK(0400000000)"), + ACE_TEXT ("LM_UNK(01000000000)"), + ACE_TEXT ("LM_UNK(02000000000)"), + ACE_TEXT ("LM_UNK(04000000000)"), + ACE_TEXT ("LM_UNK(010000000000)"), + ACE_TEXT ("LM_UNK(020000000000)") }; } @@ -109,14 +109,14 @@ ACE_Log_Record::dump (void) const // ACE_TRACE ("ACE_Log_Record::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("length_ = %d\n"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntype_ = %u\n"), this->type_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntime_stamp_ = (%:, %d)\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("length_ = %d\n"), this->length_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntype_ = %u\n"), this->type_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntime_stamp_ = (%:, %d)\n"), this->secs_, this->usecs_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\npid_ = %u\n"), this->pid_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_ (0x%@) = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\npid_ = %u\n"), this->pid_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_ (0x%@) = %s\n"), this->msg_data_, this->msg_data_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmsg_data_size_ = %B\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmsg_data_size_ = %B\n"), this->msg_data_size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -223,13 +223,13 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], // The sprintf format needs to be different for Windows and POSIX // in the wide-char case. #if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) - const ACE_TCHAR *time_fmt = ACE_LIB_TEXT ("%s.%03ld %s"); - const ACE_TCHAR *verbose_fmt = ACE_LIB_TEXT ("%s@%s@%u@%s@%s"); - const ACE_TCHAR *verbose_lite_fmt = ACE_LIB_TEXT ("%s@%s@%s"); + const ACE_TCHAR *time_fmt = ACE_TEXT ("%s.%03ld %s"); + const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%s@%s@%u@%s@%s"); + const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%s@%s@%s"); #else - const ACE_TCHAR *time_fmt = ACE_LIB_TEXT ("%ls.%03ld %ls"); - const ACE_TCHAR *verbose_fmt = ACE_LIB_TEXT ("%ls@%ls@%u@%ls@%ls"); - const ACE_TCHAR *verbose_lite_fmt = ACE_LIB_TEXT ("%ls@%ls@%ls"); + const ACE_TCHAR *time_fmt = ACE_TEXT ("%ls.%03ld %ls"); + const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%ls@%ls@%u@%ls@%ls"); + const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%ls@%ls@%ls"); #endif if (ACE_BIT_ENABLED (verbose_flag, @@ -260,7 +260,7 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[], ACE_Log_Msg::VERBOSE)) { const ACE_TCHAR *lhost_name = ((host_name == 0) - ? ACE_LIB_TEXT ("<local_host>") + ? ACE_TEXT ("<local_host>") : host_name); ACE_OS::sprintf (verbose_msg, verbose_fmt, @@ -301,11 +301,11 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[], static_cast<int> (ACE_OS::strlen (verbose_msg)); #if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) int const fwrite_result = ACE_OS::fprintf (fp, - ACE_LIB_TEXT ("%ls"), + ACE_TEXT ("%ls"), verbose_msg); #else int const fwrite_result = ACE_OS::fprintf (fp, - ACE_LIB_TEXT ("%s"), + ACE_TEXT ("%s"), verbose_msg); #endif // We should have written everything diff --git a/ACE/ace/Logging_Strategy.cpp b/ACE/ace/Logging_Strategy.cpp index cbb528f7a65..75458b3aa0d 100644 --- a/ACE/ace/Logging_Strategy.cpp +++ b/ACE/ace/Logging_Strategy.cpp @@ -42,56 +42,56 @@ ACE_Logging_Strategy::priorities (ACE_TCHAR *priority_string, // Parse string and alternate priority mask. for (ACE_TCHAR *priority = ACE_OS::strtok_r (priority_string, - ACE_LIB_TEXT ("|"), + ACE_TEXT ("|"), &strtokp); priority != 0; priority = ACE_OS::strtok_r (0, - ACE_LIB_TEXT ("|"), + ACE_TEXT ("|"), &strtokp)) { - if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("SHUTDOWN")) == 0) + if (ACE_OS::strcmp (priority, ACE_TEXT ("SHUTDOWN")) == 0) ACE_SET_BITS (priority_mask, LM_SHUTDOWN); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~SHUTDOWN")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~SHUTDOWN")) == 0) ACE_CLR_BITS (priority_mask, LM_SHUTDOWN); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("TRACE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("TRACE")) == 0) ACE_SET_BITS (priority_mask, LM_TRACE); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~TRACE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~TRACE")) == 0) ACE_CLR_BITS (priority_mask, LM_TRACE); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("DEBUG")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("DEBUG")) == 0) ACE_SET_BITS (priority_mask, LM_DEBUG); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~DEBUG")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~DEBUG")) == 0) ACE_CLR_BITS (priority_mask, LM_DEBUG); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("INFO")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("INFO")) == 0) ACE_SET_BITS (priority_mask, LM_INFO); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~INFO")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~INFO")) == 0) ACE_CLR_BITS (priority_mask, LM_INFO); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("NOTICE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("NOTICE")) == 0) ACE_SET_BITS (priority_mask, LM_NOTICE); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~NOTICE")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~NOTICE")) == 0) ACE_CLR_BITS (priority_mask, LM_NOTICE); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("WARNING")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("WARNING")) == 0) ACE_SET_BITS (priority_mask, LM_WARNING); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~WARNING")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~WARNING")) == 0) ACE_CLR_BITS (priority_mask, LM_WARNING); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("STARTUP")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("STARTUP")) == 0) ACE_SET_BITS (priority_mask, LM_STARTUP); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~STARTUP")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~STARTUP")) == 0) ACE_CLR_BITS (priority_mask, LM_STARTUP); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("ERROR")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("ERROR")) == 0) ACE_SET_BITS (priority_mask, LM_ERROR); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~ERROR")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~ERROR")) == 0) ACE_CLR_BITS (priority_mask, LM_ERROR); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("CRITICAL")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("CRITICAL")) == 0) ACE_SET_BITS (priority_mask, LM_CRITICAL); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~CRITICAL")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~CRITICAL")) == 0) ACE_CLR_BITS (priority_mask, LM_CRITICAL); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("ALERT")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("ALERT")) == 0) ACE_SET_BITS (priority_mask, LM_ALERT); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~ALERT")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~ALERT")) == 0) ACE_CLR_BITS (priority_mask, LM_ALERT); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("EMERGENCY")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("EMERGENCY")) == 0) ACE_SET_BITS (priority_mask, LM_EMERGENCY); - else if (ACE_OS::strcmp (priority, ACE_LIB_TEXT ("~EMERGENCY")) == 0) + else if (ACE_OS::strcmp (priority, ACE_TEXT ("~EMERGENCY")) == 0) ACE_CLR_BITS (priority_mask, LM_EMERGENCY); } @@ -112,24 +112,24 @@ ACE_Logging_Strategy::tokenize (ACE_TCHAR *flag_string) ACE_TCHAR *strtokp; for (ACE_TCHAR *flag = ACE_OS::strtok_r (flag_string, - ACE_LIB_TEXT ("|"), + ACE_TEXT ("|"), &strtokp); flag != 0; - flag = ACE_OS::strtok_r (0, ACE_LIB_TEXT ("|"), &strtokp)) + flag = ACE_OS::strtok_r (0, ACE_TEXT ("|"), &strtokp)) { - if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("STDERR")) == 0) + if (ACE_OS::strcmp (flag, ACE_TEXT ("STDERR")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::STDERR); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("LOGGER")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("LOGGER")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::LOGGER); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("OSTREAM")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("OSTREAM")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::OSTREAM); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("VERBOSE")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("VERBOSE")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("VERBOSE_LITE")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("VERBOSE_LITE")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::VERBOSE_LITE); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("SILENT")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("SILENT")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::SILENT); - else if (ACE_OS::strcmp (flag, ACE_LIB_TEXT ("SYSLOG")) == 0) + else if (ACE_OS::strcmp (flag, ACE_TEXT ("SYSLOG")) == 0) ACE_SET_BITS (this->flags_, ACE_Log_Msg::SYSLOG); } } @@ -154,7 +154,7 @@ ACE_Logging_Strategy::parse_args (int argc, ACE_TCHAR *argv[]) this->max_size_ = 0; ACE_Get_Opt get_opt (argc, argv, - ACE_LIB_TEXT ("f:i:k:m:n:N:op:s:t:w"), 0); + ACE_TEXT ("f:i:k:m:n:N:op:s:t:w"), 0); for (int c; (c = get_opt ()) != -1; ) { @@ -255,14 +255,14 @@ ACE_Logging_Strategy::ACE_Logging_Strategy (void) MAXPATHLEN - 7) == -1) // 7 for "logfile" { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); this->filename_[0] = 0; } // Add the filename to the end ACE_OS::strcat (this->filename_, - ACE_LIB_TEXT ("logfile")); + ACE_TEXT ("logfile")); #endif /* ACE_DEFAULT_LOGFILE */ } @@ -282,7 +282,7 @@ ACE_Logging_Strategy::fini (void) delete [] this->logger_key_; delete [] this->program_name_; - if (this->reactor () + if (this->reactor () && this->interval_ > 0 && this->max_size_ > 0) this->reactor ()->cancel_timer (this); @@ -338,12 +338,12 @@ ACE_Logging_Strategy::init (int argc, ACE_TCHAR *argv[]) if (output_file && ACE_OS::fclose (output_file) == -1) return -1; - output_file = ACE_OS::fopen (this->filename_, ACE_LIB_TEXT ("wt")); + output_file = ACE_OS::fopen (this->filename_, ACE_TEXT ("wt")); } // open a stream only if such doesn't exists else if (output_file == 0) output_file = ACE_OS::fopen (this->filename_, - ACE_LIB_TEXT ("at")); + ACE_TEXT ("at")); if (output_file == 0) return -1; @@ -415,7 +415,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, // Lock out any other logging. if (this->log_msg_->acquire ()) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Cannot acquire lock!\n")), + ACE_TEXT ("Cannot acquire lock!\n")), -1); // Close the current ostream. @@ -440,7 +440,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, // Open a new log file with the same name. #if defined (ACE_LACKS_IOSTREAM_TOTALLY) output_file = ACE_OS::fopen (this->filename_, - ACE_LIB_TEXT ("wt")); + ACE_TEXT ("wt")); if (output_file == 0) return -1; @@ -487,11 +487,11 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, for (int i = max_num ; i > 1 ;i--) { ACE_OS::sprintf (backup, - ACE_LIB_TEXT ("%s.%d"), + ACE_TEXT ("%s.%d"), this->filename_, i); ACE_OS::sprintf (to_backup, - ACE_LIB_TEXT ("%s.%d"), + ACE_TEXT ("%s.%d"), this->filename_, i - 1); @@ -504,7 +504,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, ACE_OS::rename (to_backup, backup); } ACE_OS::sprintf (backup, - ACE_LIB_TEXT ("%s.1"), + ACE_TEXT ("%s.1"), this->filename_); } else @@ -513,7 +513,7 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, count_ = 1; // start over from 1 ACE_OS::sprintf (backup, - ACE_LIB_TEXT ("%s.%d"), + ACE_TEXT ("%s.%d"), this->filename_, count_); } @@ -528,12 +528,12 @@ ACE_Logging_Strategy::handle_timeout (const ACE_Time_Value &, } else ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Backup file name too long; ") - ACE_LIB_TEXT ("backup logfile not saved.\n"))); + ACE_TEXT ("Backup file name too long; ") + ACE_TEXT ("backup logfile not saved.\n"))); // Open a new log file by the same name #if defined (ACE_LACKS_IOSTREAM_TOTALLY) - output_file = ACE_OS::fopen (this->filename_, ACE_LIB_TEXT ("wt")); + output_file = ACE_OS::fopen (this->filename_, ACE_TEXT ("wt")); if (output_file == 0) return -1; diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp index bebe179c765..fed5da3a328 100644 --- a/ACE/ace/MEM_Acceptor.cpp +++ b/ACE/ace/MEM_Acceptor.cpp @@ -59,7 +59,7 @@ ACE_MEM_Acceptor::ACE_MEM_Acceptor (const ACE_MEM_Addr &remote_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor"))); + ACE_TEXT ("ACE_MEM_Acceptor::ACE_MEM_Acceptor"))); } int @@ -140,7 +140,7 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (this->mmap_prefix_ != 0) { ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s_%d_"), + ACE_TEXT ("%s_%d_"), this->mmap_prefix_, local_addr.get_port_number ()); } @@ -151,13 +151,13 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (ACE::get_temp_dir (buf, MAXPATHLEN - 24) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); buf[0] = 0; } ACE_OS::sprintf (name, - ACE_LIB_TEXT ("MEM_Acceptor_%d_"), + ACE_TEXT ("MEM_Acceptor_%d_"), local_addr.get_port_number ()); ACE_OS::strcat (buf, name); } @@ -185,14 +185,14 @@ ACE_MEM_Acceptor::accept (ACE_MEM_Stream &new_stream, if (ACE::send (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Acceptor::accept error sending strategy\n")), + ACE_TEXT ("ACE_MEM_Acceptor::accept error sending strategy\n")), -1); // Now we get the signaling strategy the client support. if (ACE::recv (new_handle, &client_signaling, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"), ACE_LIB_TEXT ("accept")), + ACE_TEXT ("ACE_MEM_Acceptor::%p error receiving strategy\n"), ACE_TEXT ("accept")), -1); // Ensure minimum buffer size diff --git a/ACE/ace/MEM_Addr.cpp b/ACE/ace/MEM_Addr.cpp index 42fed32e400..e86682d8b5c 100644 --- a/ACE/ace/MEM_Addr.cpp +++ b/ACE/ace/MEM_Addr.cpp @@ -69,7 +69,7 @@ ACE_MEM_Addr::initialize_local (u_short port_number) return -1; this->external_.set (port_number, name); - this->internal_.set (port_number, ACE_LIB_TEXT ("localhost")); + this->internal_.set (port_number, ACE_TEXT ("localhost")); return 0; } diff --git a/ACE/ace/MEM_Connector.cpp b/ACE/ace/MEM_Connector.cpp index a2e33cedc81..c66641404bd 100644 --- a/ACE/ace/MEM_Connector.cpp +++ b/ACE/ace/MEM_Connector.cpp @@ -22,7 +22,7 @@ ACE_MEM_Connector::dump (void) const ACE_TRACE ("ACE_MEM_Connector::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -70,9 +70,9 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (!this->address_.same_host (remote_sap)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) MEM_Connector can't connect ") - ACE_LIB_TEXT ("to %s:%d which is not a local endpoint ") - ACE_LIB_TEXT ("(local address is %s:%d)\n"), + ACE_TEXT ("(%P|%t) MEM_Connector can't connect ") + ACE_TEXT ("to %s:%d which is not a local endpoint ") + ACE_TEXT ("(local address is %s:%d)\n"), ACE_TEXT_CHAR_TO_TCHAR (remote_sap.get_host_name ()), remote_sap.get_port_number (), ACE_TEXT_CHAR_TO_TCHAR (this->address_.get_host_name ()), @@ -89,8 +89,8 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, timeout, local_sap, reuse_addr, flags, perms) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_MEM_Connector::connect")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_MEM_Connector::connect")), -1); @@ -108,7 +108,7 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (ACE::recv (new_handle, &server_strategy, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Connector::connect error receiving strategy\n")), + ACE_TEXT ("ACE_MEM_Connector::connect error receiving strategy\n")), -1); // If either side don't support MT, we will not use it. @@ -121,19 +121,19 @@ ACE_MEM_Connector::connect (ACE_MEM_Stream &new_stream, if (ACE::send (new_handle, &server_strategy, sizeof (ACE_INT16)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Connector::connect error sending strategy\n")), + ACE_TEXT ("ACE_MEM_Connector::connect error sending strategy\n")), -1); ACE_INT16 buf_len; // Byte-order is not a problem for this read. if (ACE::recv (new_handle, &buf_len, sizeof (buf_len)) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Connector::connect error receiving shm filename length\n")), + ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename length\n")), -1); if (ACE::recv (new_handle, buf, buf_len) == -1) ACE_ERROR_RETURN ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_MEM_Connector::connect error receiving shm filename.\n")), + ACE_TEXT ("ACE_MEM_Connector::connect error receiving shm filename.\n")), -1); if (new_stream.init (buf, diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp index 96001b954c0..9d6167c6ce7 100644 --- a/ACE/ace/MEM_IO.cpp +++ b/ACE/ace/MEM_IO.cpp @@ -175,13 +175,13 @@ ACE_MT_MEM_IO::init (ACE_HANDLE handle, // Building names. @@ Check buffer overflow? ACE_OS::strcpy (server_sema, basename); - ACE_OS::strcat (server_sema, ACE_LIB_TEXT ("_sema_to_server")); + ACE_OS::strcat (server_sema, ACE_TEXT ("_sema_to_server")); ACE_OS::strcpy (client_sema, basename); - ACE_OS::strcat (client_sema, ACE_LIB_TEXT ("_sema_to_client")); + ACE_OS::strcat (client_sema, ACE_TEXT ("_sema_to_client")); ACE_OS::strcpy (server_lock, basename); - ACE_OS::strcat (server_lock, ACE_LIB_TEXT ("_lock_to_server")); + ACE_OS::strcat (server_lock, ACE_TEXT ("_lock_to_server")); ACE_OS::strcpy (client_lock, basename); - ACE_OS::strcat (client_lock, ACE_LIB_TEXT ("_lock_to_client")); + ACE_OS::strcat (client_lock, ACE_TEXT ("_lock_to_client")); void *to_server_ptr = 0; // @@ Here, we assume the shared memory fill will never be resued. diff --git a/ACE/ace/MEM_SAP.cpp b/ACE/ace/MEM_SAP.cpp index 453f86f5bfd..8a98a3b3d0c 100644 --- a/ACE/ace/MEM_SAP.cpp +++ b/ACE/ace/MEM_SAP.cpp @@ -24,7 +24,7 @@ ACE_MEM_SAP::dump (void) const if (this->shm_malloc_ != 0) this->shm_malloc_->dump (); else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_MEM_SAP uninitialized.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_MEM_SAP uninitialized.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/MMAP_Memory_Pool.cpp b/ACE/ace/MMAP_Memory_Pool.cpp index 7959b091906..e43e3a47b73 100644 --- a/ACE/ace/MMAP_Memory_Pool.cpp +++ b/ACE/ace/MMAP_Memory_Pool.cpp @@ -172,14 +172,14 @@ ACE_MMAP_Memory_Pool::ACE_MMAP_Memory_Pool ( // -17 for ace-malloc-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); this->backing_store_name_[0] = 0; } // Add the filename to the end ACE_OS::strcat (this->backing_store_name_, - ACE_LIB_TEXT ("ace-malloc-XXXXXX")); + ACE_TEXT ("ace-malloc-XXXXXX")); // If requested an unique filename, use mktemp to get a random file. if (options && options->unique_) @@ -242,7 +242,7 @@ ACE_MMAP_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, "", 1) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("(%P|%t) %p\n"), this->backing_store_name_), -1); } @@ -291,7 +291,7 @@ ACE_MMAP_Memory_Pool::map_file (size_t map_size) { #if 0 ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"), + ACE_TEXT ("(%P|%t) addr = %u, base_addr = %u, map_size = %u, %p\n"), this->mmap_.addr (), this->base_addr_, map_size, @@ -377,8 +377,8 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, 0, this->sa_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("MMAP_Memory_Pool::init_acquire, EEXIST")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("MMAP_Memory_Pool::init_acquire, EEXIST")), 0); #if (ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1) @@ -391,8 +391,8 @@ ACE_MMAP_Memory_Pool::init_acquire (size_t nbytes, } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("MMAP_Memory_Pool::init_acquire")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("MMAP_Memory_Pool::init_acquire")), 0); } @@ -419,7 +419,7 @@ int ACE_MMAP_Memory_Pool::remap (void *addr) { ACE_TRACE ("ACE_MMAP_Memory_Pool::remap"); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Remapping with fault address at: %X\n"), addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Remapping with fault address at: %X\n"), addr)); size_t const current_map_size = ACE_Utils::truncate_cast<size_t> (ACE_OS::filesize (this->mmap_.handle ())); // ACE_OS::lseek (this->mmap_.handle (), 0, SEEK_END); @@ -475,9 +475,9 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t return -1; #if 0 else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) received %S\n"), signum)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) received %S\n"), signum)); #endif - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) new mapping address = %u\n"), (char *) this->base_addr_ + current_map_size)); #if defined (ACE_HAS_SIGINFO_T) && !defined (ACE_LACKS_SI_ADDR) // Make sure that the pointer causing the problem is within the @@ -485,7 +485,7 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); if (this->remap ((void *) siginfo->si_addr) == -1) return -1; // ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) address %u out of range\n", diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index 7dbd8272dd8..f1b136ac3af 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -33,8 +33,8 @@ ACE_Control_Block::ACE_Malloc_Header::dump (void) const ACE_TRACE ("ACE_Control_Block::ACE_Malloc_Header::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %@"), (ACE_Malloc_Header *) this->next_block_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -44,20 +44,20 @@ ACE_Control_Block::print_alignment_info (void) { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_Control_Block::print_alignment_info:\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Sizeof ptr: %d\n") - ACE_LIB_TEXT ("Sizeof size_t: %d\n") - ACE_LIB_TEXT ("Sizeof long: %d\n") - ACE_LIB_TEXT ("Sizeof double: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_PADDING: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_PADDING_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_CONTROL_BLOCK_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_CONTROL_BLOCK_ALIGN_BYTES: %d\n") - ACE_LIB_TEXT ("Sizeof (MALLOC_HEADER): %d\n") - ACE_LIB_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), + ACE_TEXT ("Sizeof ptr: %d\n") + ACE_TEXT ("Sizeof size_t: %d\n") + ACE_TEXT ("Sizeof long: %d\n") + ACE_TEXT ("Sizeof double: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_PADDING: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_PADDING_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_CONTROL_BLOCK_ALIGN_BYTES: %d\n") + ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n") + ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), sizeof (char *), sizeof (size_t), sizeof (long), @@ -71,7 +71,7 @@ ACE_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_Control_Block::print_alignment_info:\n"))); #endif /* ACE_HAS_DUMP */ } @@ -82,22 +82,22 @@ ACE_Control_Block::dump (void) const ACE_TRACE ("ACE_Control_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %@"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nMalloc Header:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -143,13 +143,13 @@ ACE_Control_Block::ACE_Name_Node::dump (void) const ACE_TRACE ("ACE_Control_Block::ACE_Name_Node::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("pointer = %@"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("pointer = %@"), (const char *) this->pointer_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %@"), (ACE_Name_Node *) this->next_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nname_ = (%@, %s)"), + ACE_TEXT ("\nname_ = (%@, %s)"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -175,10 +175,10 @@ ACE_Malloc_Stats::dump (void) const int const ninuse = this->ninuse_.value (); int const nchunks = this->nchunks_.value (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("nblocks = %d"), nblocks)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\nninuse = %d"), ninuse)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\nnchunks = %d"), nchunks)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("nblocks = %d"), nblocks)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nninuse = %d"), ninuse)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnchunks = %d"), nchunks)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Malloc_Allocator.cpp b/ACE/ace/Malloc_Allocator.cpp index deeaffc54eb..b84d3fac3c8 100644 --- a/ACE/ace/Malloc_Allocator.cpp +++ b/ACE/ace/Malloc_Allocator.cpp @@ -349,10 +349,10 @@ ACE_Static_Allocator_Base::dump (void) const ACE_TRACE ("ACE_Static_Allocator_Base::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noffset_ = %d"), this->offset_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noffset_ = %d"), this->offset_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d\n"), this->size_)); ACE_HEX_DUMP ((LM_DEBUG, this->buffer_, this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index 674b1916f33..7e5b222d6f7 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -340,7 +340,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->memory_pool_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cb_ptr_ = %@\n"), this->cb_ptr_)); this->cb_ptr_->dump (); #if defined (ACE_HAS_MALLOC_STATS) if (this->cb_ptr_ != 0) @@ -362,14 +362,14 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::print_stats (void) const return; this->cb_ptr_->malloc_stats_.dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) contents of freelist:\n"))); + ACE_TEXT ("(%P|%t) contents of freelist:\n"))); for (MALLOC_HEADER *currp = this->cb_ptr_->freep_->next_block_; ; currp = currp->next_block_) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ptr = %@, MALLOC_HEADER units = %d, byte units = %d\n"), + ACE_TEXT ("(%P|%t) ptr = %@, MALLOC_HEADER units = %d, byte units = %d\n"), currp, currp->size_, currp->size_ * sizeof (MALLOC_HEADER))); @@ -412,12 +412,12 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::open (void) first_time); if (this->cb_ptr_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("init_acquire failed")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("init_acquire failed")), -1); else if (first_time) { - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) first time in, control block = %@\n"), this->cb_ptr_)); MALLOC_HEADER::init_ptr (&this->cb_ptr_->freep_, &this->cb_ptr_->base_, @@ -489,8 +489,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p if (this->bad_flag_ == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> @@ -513,8 +513,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } @@ -540,8 +540,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } #if !defined (ACE_HAS_TEMPLATE_TYPEDEFS) @@ -564,8 +564,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T (const ACE_TCHAR *p this->bad_flag_ = this->open (); if (this->bad_flag_ == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::ACE_Malloc_T"))); } #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ @@ -587,7 +587,7 @@ template <ACE_MEM_POOL_1, class ACE_LOCK, class ACE_CB> int ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove (void) { ACE_TRACE ("ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::remove"); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) destroying ACE_Malloc_T\n"))); #if defined (ACE_HAS_MALLOC_STATS) this->print_stats (); @@ -719,8 +719,8 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::shared_malloc (size_t nbytes) // wchar before printing out. The compiler will complain // about this since a destructor would present in a SEH block //ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("(%P|%t) %p\n"), - // ACE_LIB_TEXT ("malloc")), + // ACE_TEXT ("(%P|%t) %p\n"), + // ACE_TEXT ("malloc")), // 0); } prevp = currp; @@ -1055,8 +1055,8 @@ ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -1150,8 +1150,8 @@ ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->curr_->dump (); this->guard_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("name_ = %s"), this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("name_ = %s"), this->name_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Malloc_T.inl b/ACE/ace/Malloc_T.inl index dee20160cb2..078c0308ff5 100644 --- a/ACE/ace/Malloc_T.inl +++ b/ACE/ace/Malloc_T.inl @@ -64,7 +64,7 @@ ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB>::release (int close) int const retv = --this->cb_ptr_->ref_counter_; #if 0 - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P) ACE_Malloc_T::release ->%d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P) ACE_Malloc_T::release ->%d\n"), this->cb_ptr_->ref_counter_ - 1)); #endif /* 0 */ if (close) diff --git a/ACE/ace/Map_Manager.cpp b/ACE/ace/Map_Manager.cpp index 7ee226e8821..85957918df4 100644 --- a/ACE/ace/Map_Manager.cpp +++ b/ACE/ace/Map_Manager.cpp @@ -596,11 +596,11 @@ ACE_Map_Entry<EXT_ID, INT_ID>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("prev_ = %d"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("prev_ = %d"), this->prev_)); #if defined (ACE_HAS_LAZY_MAP_MANAGER) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("free_ = %d"), this->free_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("free_ = %d"), this->free_)); #endif /* ACE_HAS_LAZY_MAP_MANAGER */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -612,8 +612,8 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("total_size_ = %d"), this->total_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("total_size_ = %d"), this->total_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); this->allocator_->dump (); this->lock_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -625,7 +625,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -635,7 +635,7 @@ ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("next_ = %d"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("next_ = %d"), this->next_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Map_Manager.inl b/ACE/ace/Map_Manager.inl index bf9a19c4949..cbbc108bcf2 100644 --- a/ACE/ace/Map_Manager.inl +++ b/ACE/ace/Map_Manager.inl @@ -8,7 +8,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class EXT_ID, class INT_ID> ACE_INLINE -ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) +ACE_Map_Entry<EXT_ID, INT_ID>::ACE_Map_Entry (void) : next_ (0), prev_ (0) #if defined (ACE_HAS_LAZY_MAP_MANAGER) @@ -56,7 +56,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (size_t size, cur_size_ (0) { if (this->open (size, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE @@ -67,7 +67,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Manager (ACE_Allocator *alloc cur_size_ (0) { if (this->open (ACE_DEFAULT_MAP_SIZE, alloc) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_Map_Manager\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Map_Manager\n"))); } template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int diff --git a/ACE/ace/Mem_Map.cpp b/ACE/ace/Mem_Map.cpp index f5562687f84..02c38699d10 100644 --- a/ACE/ace/Mem_Map.cpp +++ b/ACE/ace/Mem_Map.cpp @@ -27,12 +27,12 @@ ACE_Mem_Map::dump (void) const ACE_TRACE ("ACE_Mem_Map::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base_addr_ = %x"), this->base_addr_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfilename_ = %s"), this->filename_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nlength_ = %d"), this->length_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandle_ = %d"), this->handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base_addr_ = %x"), this->base_addr_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfilename_ = %s"), this->filename_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nlength_ = %d"), this->length_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandle_ = %d"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nfile_mapping_ = %d"), this->file_mapping_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nclose_handle_ = %d"), this->close_handle_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -249,8 +249,8 @@ ACE_Mem_Map::ACE_Mem_Map (const ACE_TCHAR *file_name, offset, sa) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } // Map a file from an open file descriptor HANDLE. This function will @@ -282,8 +282,8 @@ ACE_Mem_Map::ACE_Mem_Map (ACE_HANDLE handle, offset, sa) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Mem_Map::ACE_Mem_Map"))); } // Close down and remove the file from the file system. diff --git a/ACE/ace/Message_Block.cpp b/ACE/ace/Message_Block.cpp index 1c0195f7d15..8ba63715503 100644 --- a/ACE/ace/Message_Block.cpp +++ b/ACE/ace/Message_Block.cpp @@ -149,15 +149,15 @@ ACE_Data_Block::dump (void) const ACE_TRACE ("ACE_Data_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("-----( Data Block )-----\n") - ACE_LIB_TEXT ("type_ = %d\n") - ACE_LIB_TEXT ("cur_size_ = %u\n") - ACE_LIB_TEXT ("max_size_ = %u\n") - ACE_LIB_TEXT ("flags_ = %u\n") - ACE_LIB_TEXT ("base_ = %u\n") - ACE_LIB_TEXT ("locking_strategy_ = %u\n") - ACE_LIB_TEXT ("reference_count_ = %u\n") - ACE_LIB_TEXT ("---------------------------\n"), + ACE_TEXT ("-----( Data Block )-----\n") + ACE_TEXT ("type_ = %d\n") + ACE_TEXT ("cur_size_ = %u\n") + ACE_TEXT ("max_size_ = %u\n") + ACE_TEXT ("flags_ = %u\n") + ACE_TEXT ("base_ = %u\n") + ACE_TEXT ("locking_strategy_ = %u\n") + ACE_TEXT ("reference_count_ = %u\n") + ACE_TEXT ("---------------------------\n"), this->type_, this->cur_size_, this->max_size_, @@ -177,14 +177,14 @@ ACE_Message_Block::dump (void) const ACE_TRACE ("ACE_Message_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("-----( Message Block )-----\n") - ACE_LIB_TEXT ("priority_ = %d\n") - ACE_LIB_TEXT ("next_ = %u\n") - ACE_LIB_TEXT ("prev_ = %u\n") - ACE_LIB_TEXT ("cont_ = %u\n") - ACE_LIB_TEXT ("rd_ptr_ = %u\n") - ACE_LIB_TEXT ("wr_ptr_ = %u\n") - ACE_LIB_TEXT ("---------------------------\n"), + ACE_TEXT ("-----( Message Block )-----\n") + ACE_TEXT ("priority_ = %d\n") + ACE_TEXT ("next_ = %u\n") + ACE_TEXT ("prev_ = %u\n") + ACE_TEXT ("cont_ = %u\n") + ACE_TEXT ("rd_ptr_ = %u\n") + ACE_TEXT ("wr_ptr_ = %u\n") + ACE_TEXT ("---------------------------\n"), this->priority_, this->next_, this->prev_, @@ -408,7 +408,7 @@ ACE_Message_Block::ACE_Message_Block (const char *data, 0, // data_block allocator 0) == -1) // message_block allocator ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) @@ -431,7 +431,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator) 0, // data_block allocator message_block_allocator) == -1) // message_block allocator ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (size_t size, @@ -464,7 +464,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, data_block_allocator, message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); } int @@ -551,7 +551,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size, data_block_allocator, message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, @@ -576,7 +576,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block, data_block->data_block_allocator (), message_block_allocator) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); } ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, @@ -603,7 +603,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, mb.data_block ()->data_block_allocator (), mb.message_block_allocator_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); #if !defined (ACE_LACKS_CDR_ALIGNMENT) // Align ourselves char *start = ACE_ptr_align_binary (this->base (), @@ -633,7 +633,7 @@ ACE_Message_Block::ACE_Message_Block (const ACE_Message_Block &mb, mb.data_block ()->data_block_allocator (), mb.message_block_allocator_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Block"))); + ACE_TEXT ("ACE_Message_Block"))); #if !defined (ACE_LACKS_CDR_ALIGNMENT) // Align ourselves @@ -1350,13 +1350,13 @@ ACE_Dynamic_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("static_bit_field_mask_ = %u\n") - ACE_LIB_TEXT ("static_bit_field_shift_ = %u\n") - ACE_LIB_TEXT ("dynamic_priority_max_ = %u\n") - ACE_LIB_TEXT ("dynamic_priority_offset_ = %u\n") - ACE_LIB_TEXT ("max_late_ = [%d sec, %d usec]\n") - ACE_LIB_TEXT ("min_pending_ = [%d sec, %d usec]\n") - ACE_LIB_TEXT ("pending_shift_ = [%d sec, %d usec]\n"), + ACE_TEXT ("static_bit_field_mask_ = %u\n") + ACE_TEXT ("static_bit_field_shift_ = %u\n") + ACE_TEXT ("dynamic_priority_max_ = %u\n") + ACE_TEXT ("dynamic_priority_offset_ = %u\n") + ACE_TEXT ("max_late_ = [%d sec, %d usec]\n") + ACE_TEXT ("min_pending_ = [%d sec, %d usec]\n") + ACE_TEXT ("pending_shift_ = [%d sec, %d usec]\n"), this->static_bit_field_mask_, this->static_bit_field_shift_, this->dynamic_priority_max_, @@ -1405,10 +1405,10 @@ ACE_Deadline_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Deadline_Message_Strategy\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -1448,10 +1448,10 @@ ACE_Laxity_Message_Strategy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Dynamic_Message_Strategy base class: \n"))); this->ACE_Dynamic_Message_Strategy::dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nderived class: ACE_Laxity_Message_Strategy\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Message_Queue.cpp b/ACE/ace/Message_Queue.cpp index 47b2430f151..672a1f9876a 100644 --- a/ACE/ace/Message_Queue.cpp +++ b/ACE/ace/Message_Queue.cpp @@ -216,25 +216,25 @@ ACE_Message_Queue_NT::dump (void) const { case ACE_Message_Queue_Base::ACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = ACTIVATED\n"))); + ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = DEACTIVATED\n"))); + ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = PULSED\n"))); + ACE_TEXT ("state = PULSED\n"))); break; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("max_cthrs_ = %d\n") - ACE_LIB_TEXT ("cur_thrs_ = %d\n") - ACE_LIB_TEXT ("cur_bytes = %d\n") - ACE_LIB_TEXT ("cur_length = %d\n") - ACE_LIB_TEXT ("cur_count = %d\n") - ACE_LIB_TEXT ("completion_port_ = %x\n"), + ACE_TEXT ("max_cthrs_ = %d\n") + ACE_TEXT ("cur_thrs_ = %d\n") + ACE_TEXT ("cur_bytes = %d\n") + ACE_TEXT ("cur_length = %d\n") + ACE_TEXT ("cur_count = %d\n") + ACE_TEXT ("completion_port_ = %x\n"), this->max_cthrs_, this->cur_thrs_, this->cur_bytes_, diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index 5a367ab2fa5..89ede16ac5b 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -58,7 +58,7 @@ ACE_Message_Queue_Ex<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::ACE_Message_Queue_Ex (siz if (this->queue_.open (hwm, lwm, ns) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Message_Queue_Ex"))); + ACE_TEXT ("ACE_Message_Queue_Ex"))); } template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> @@ -402,7 +402,7 @@ ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::enqueue_tail template <class ACE_MESSAGE_TYPE, ACE_SYNCH_DECL> ACE_Message_Block * ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::wrap_with_mbs_i (ACE_MESSAGE_TYPE *new_item) -{ +{ ACE_TRACE ("ACE_Message_Queue_Ex_N<ACE_MESSAGE_TYPE, ACE_SYNCH_USE>::wrap_with_mbs_i"); // We need to keep a reference to the head of the chain @@ -868,25 +868,25 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const { case ACE_Message_Queue_Base::ACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = ACTIVATED\n"))); + ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = DEACTIVATED\n"))); + ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = PULSED\n"))); + ACE_TEXT ("state = PULSED\n"))); break; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("low_water_mark = %d\n") - ACE_LIB_TEXT ("high_water_mark = %d\n") - ACE_LIB_TEXT ("cur_bytes = %d\n") - ACE_LIB_TEXT ("cur_length = %d\n") - ACE_LIB_TEXT ("cur_count = %d\n") - ACE_LIB_TEXT ("head_ = %u\n") - ACE_LIB_TEXT ("tail_ = %u\n"), + ACE_TEXT ("low_water_mark = %d\n") + ACE_TEXT ("high_water_mark = %d\n") + ACE_TEXT ("cur_bytes = %d\n") + ACE_TEXT ("cur_length = %d\n") + ACE_TEXT ("cur_count = %d\n") + ACE_TEXT ("head_ = %u\n") + ACE_TEXT ("tail_ = %u\n"), this->low_water_mark_, this->high_water_mark_, this->cur_bytes_, @@ -894,9 +894,9 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->cur_count_, this->head_, this->tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("not_full_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_full_cond: \n"))); not_full_cond_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("not_empty_cond: \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("not_empty_cond: \n"))); not_empty_cond_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -931,7 +931,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::ACE_Message_Queue (size_t hwm, if (this->open (hwm, lwm, ns) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("open"))); + ACE_TEXT ("open"))); } template <ACE_SYNCH_DECL> @@ -940,7 +940,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::~ACE_Message_Queue (void) ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::~ACE_Message_Queue"); if (this->head_ != 0 && this->close () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("close"))); + ACE_TEXT ("close"))); } template <ACE_SYNCH_DECL> int @@ -1317,7 +1317,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item { if (this->head_ ==0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Attempting to dequeue from empty queue")), + ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i"); first_item = this->head_; @@ -1439,7 +1439,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i (ACE_Message_Block *&dequeued) { if (this->head_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Attempting to dequeue from empty queue")), + ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail_i"); dequeued = this->tail_; @@ -1489,7 +1489,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_deadline_i (ACE_Message_Block *&dequeu #if defined (ACE_HAS_TIMED_MESSAGE_BLOCKS) if (this->head_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Attempting to dequeue from empty queue")), + ACE_TEXT ("Attempting to dequeue from empty queue")), -1); ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_deadline_i"); @@ -2083,16 +2083,16 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class): \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH_USE> (base class): \n"))); this->ACE_Message_Queue<ACE_SYNCH_USE>::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("pending_head_ = %u\n") - ACE_LIB_TEXT ("pending_tail_ = %u\n") - ACE_LIB_TEXT ("late_head_ = %u\n") - ACE_LIB_TEXT ("late_tail_ = %u\n") - ACE_LIB_TEXT ("beyond_late_head_ = %u\n") - ACE_LIB_TEXT ("beyond_late_tail_ = %u\n"), + ACE_TEXT ("pending_head_ = %u\n") + ACE_TEXT ("pending_tail_ = %u\n") + ACE_TEXT ("late_head_ = %u\n") + ACE_TEXT ("late_tail_ = %u\n") + ACE_TEXT ("beyond_late_head_ = %u\n") + ACE_TEXT ("beyond_late_tail_ = %u\n"), this->pending_head_, this->pending_tail_, this->late_head_, @@ -2100,7 +2100,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const this->beyond_late_head_, this->beyond_late_tail_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("message_strategy_ : \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("message_strategy_ : \n"))); message_strategy_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -2504,7 +2504,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ { // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected LATE)"), + ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); } @@ -2546,7 +2546,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ if (current_status != ACE_Dynamic_Message_Strategy::PENDING) // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN((LM_ERROR, - ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), + ACE_TEXT ("Unexpected message priority status [%d] (expected PENDING)"), (int) current_status), -1); @@ -2568,7 +2568,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_ default: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN((LM_ERROR, - ACE_LIB_TEXT ("Unknown message priority status [%d]"), + ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); } @@ -2624,7 +2624,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val else if (current_status != ACE_Dynamic_Message_Strategy::LATE) // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unexpected message priority status [%d] (expected LATE)"), + ACE_TEXT ("Unexpected message priority status [%d] (expected LATE)"), (int) current_status), -1); } @@ -2645,14 +2645,14 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val case ACE_Dynamic_Message_Strategy::PENDING: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unexpected message priority status ") - ACE_LIB_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), + ACE_TEXT ("Unexpected message priority status ") + ACE_TEXT ("[%d] (expected LATE or BEYOND_LATE)"), (int) current_status), -1); default: // if we got here, something is *seriously* wrong with the queue ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unknown message priority status [%d]"), + ACE_TEXT ("Unknown message priority status [%d]"), (int) current_status), -1); } diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp index 675b3297350..a4af0a74a8d 100644 --- a/ACE/ace/Message_Queue_Vx.cpp +++ b/ACE/ace/Message_Queue_Vx.cpp @@ -30,25 +30,25 @@ ACE_Message_Queue_Vx::dump (void) const { case ACE_Message_Queue_Base::ACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = ACTIVATED\n"))); + ACE_TEXT ("state = ACTIVATED\n"))); break; case ACE_Message_Queue_Base::DEACTIVATED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = DEACTIVATED\n"))); + ACE_TEXT ("state = DEACTIVATED\n"))); break; case ACE_Message_Queue_Base::PULSED: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("state = PULSED\n"))); + ACE_TEXT ("state = PULSED\n"))); break; } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("low_water_mark = %d\n") - ACE_LIB_TEXT ("high_water_mark = %d\n") - ACE_LIB_TEXT ("cur_bytes = %d\n") - ACE_LIB_TEXT ("cur_length = %d\n") - ACE_LIB_TEXT ("cur_count = %d\n") - ACE_LIB_TEXT ("head_ = %u\n") - ACE_LIB_TEXT ("MSG_Q_ID = %u\n"), + ACE_TEXT ("low_water_mark = %d\n") + ACE_TEXT ("high_water_mark = %d\n") + ACE_TEXT ("cur_bytes = %d\n") + ACE_TEXT ("cur_length = %d\n") + ACE_TEXT ("cur_count = %d\n") + ACE_TEXT ("head_ = %u\n") + ACE_TEXT ("MSG_Q_ID = %u\n"), this->low_water_mark_, this->high_water_mark_, this->cur_bytes_, @@ -70,7 +70,7 @@ ACE_Message_Queue_Vx::ACE_Message_Queue_Vx (size_t max_messages, ACE_TRACE ("ACE_Message_Queue_Vx::ACE_Message_Queue_Vx"); if (this->open (max_messages_, max_message_length_, ns) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("open"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("open"))); } ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) @@ -78,7 +78,7 @@ ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx (void) ACE_TRACE ("ACE_Message_Queue_Vx::~ACE_Message_Queue_Vx"); if (this->tail_ != 0 && this->close () == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("close"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("close"))); } // Don't bother locking since if someone calls this function more than diff --git a/ACE/ace/Module.cpp b/ACE/ace/Module.cpp index 2a588f1616d..78723cf674b 100644 --- a/ACE/ace/Module.cpp +++ b/ACE/ace/Module.cpp @@ -161,7 +161,7 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (void) : flags_ (M_FLAGS_NOT_SET) { ACE_TRACE ("ACE_Module<ACE_SYNCH_USE>::ACE_Module"); - this->name (ACE_LIB_TEXT ("<unknown>")); + this->name (ACE_TEXT ("<unknown>")); // Do nothing... this->q_pair_[0] = 0; this->q_pair_[1] = 0; @@ -192,8 +192,8 @@ ACE_Module<ACE_SYNCH_USE>::ACE_Module (const ACE_TCHAR *mod_name, if (this->open (mod_name, writer_q, reader_q, args, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Module"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Module"))); } template <ACE_SYNCH_DECL> int diff --git a/ACE/ace/Multihomed_INET_Addr.cpp b/ACE/ace/Multihomed_INET_Addr.cpp index 152127daeb4..131adbe070e 100644 --- a/ACE/ace/Multihomed_INET_Addr.cpp +++ b/ACE/ace/Multihomed_INET_Addr.cpp @@ -54,7 +54,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, address_family); if (ret) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), + ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), ACE_TEXT_CHAR_TO_TCHAR (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } @@ -90,7 +90,7 @@ ACE_Multihomed_INET_Addr::ACE_Multihomed_INET_Addr(u_short port_number, address_family); if (ret) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), + ACE_TEXT ("Invalid INET addr (%s:%u) will be ignored\n"), ACE_TEXT_WCHAR_TO_TCHAR (secondary_host_names[i]), port_number)); this->secondaries_.size(this->secondaries_.size() - 1); } diff --git a/ACE/ace/Mutex.cpp b/ACE/ace/Mutex.cpp index 1c45bc6d17d..406c1b3ed1c 100644 --- a/ACE/ace/Mutex.cpp +++ b/ACE/ace/Mutex.cpp @@ -26,10 +26,10 @@ ACE_Mutex::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); #if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lockname_ = %s\n"), this->lockname_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("process_lock_ = %x\n"), this->process_lock_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lockname_ = %s\n"), this->lockname_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("process_lock_ = %x\n"), this->process_lock_)); #endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -92,8 +92,8 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, arg) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Mutex::ACE_Mutex"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Mutex::ACE_Mutex"))); return; } } @@ -109,8 +109,8 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Mutex::ACE_Mutex"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Mutex::ACE_Mutex"))); #if defined(ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) } #endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h index 7d058d5b132..2d145f7fe6d 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -33,7 +33,7 @@ # define ACE_DEFAULT_MUTEX_W ACE_TEXT_WIDE(ACE_DEFAULT_MUTEX_A) # endif /* ACE_HAS_WCHAR */ -# define ACE_DEFAULT_MUTEX ACE_LIB_TEXT (ACE_DEFAULT_MUTEX_A) +# define ACE_DEFAULT_MUTEX ACE_TEXT (ACE_DEFAULT_MUTEX_A) ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index 8b969abb9d7..3e04fe5a64e 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -195,8 +195,8 @@ ACE_NT_Service::insert (DWORD start_type, if (ACE_TEXT_GetModuleFileName (0, this_exe + 1, MAXPATHLEN) == 0) return -1; // Make sure that this_exe is quoted - this_exe[0] = ACE_LIB_TEXT ('\"'); - ACE_OS::strcat (this_exe, ACE_LIB_TEXT ("\"")); + this_exe[0] = ACE_TEXT ('\"'); + ACE_OS::strcat (this_exe, ACE_TEXT ("\"")); exe_path = this_exe; } diff --git a/ACE/ace/Name_Proxy.cpp b/ACE/ace/Name_Proxy.cpp index e33237069fd..026856e75bd 100644 --- a/ACE/ace/Name_Proxy.cpp +++ b/ACE/ace/Name_Proxy.cpp @@ -17,7 +17,7 @@ ACE_Name_Proxy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->connector_.dump (); this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("reactor_ = %x"), this->reactor_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reactor_ = %x"), this->reactor_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -59,8 +59,8 @@ ACE_Name_Proxy::ACE_Name_Proxy ( if (this->open (remote_addr, options) == -1 && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } // Obtain underlying handle. @@ -81,16 +81,16 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("encode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("encode failed")), -1); // Transmit request via a blocking send. if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("send_n failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n failed")), -1); else { @@ -101,13 +101,13 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (this->peer_.recv_n (&reply, sizeof reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("recv failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("recv failed")), -1); else if (reply.decode () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("decode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); return reply.status (); @@ -123,16 +123,16 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("encode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("encode failed")), -1); // Transmit request via a blocking send. else if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("send_n failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n failed")), -1); return 0; } @@ -151,11 +151,11 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) case -1: // FALLTHROUGH ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("****************** recv_reply returned -1\n"))); + ACE_TEXT ("****************** recv_reply returned -1\n"))); default: ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p got %d bytes, expected %d bytes\n"), - ACE_LIB_TEXT ("recv failed"), + ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), + ACE_TEXT ("recv failed"), n, sizeof (ACE_UINT32))); // FALLTHROUGH @@ -178,8 +178,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (n != ssize_t (length - sizeof (ACE_UINT32))) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p expected %d, got %d\n"), - ACE_LIB_TEXT ("invalid length"), + ACE_TEXT ("%p expected %d, got %d\n"), + ACE_TEXT ("invalid length"), length, n)); return -1; @@ -189,8 +189,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (reply.decode () == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("decode failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("decode failed"))); return -1; } } diff --git a/ACE/ace/Name_Request_Reply.cpp b/ACE/ace/Name_Request_Reply.cpp index 21424a42d4b..e602cd58b80 100644 --- a/ACE/ace/Name_Request_Reply.cpp +++ b/ACE/ace/Name_Request_Reply.cpp @@ -335,82 +335,82 @@ ACE_Name_Request::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Name_Request::dump"); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("*******\nlength = %d\n"), + ACE_TEXT ("*******\nlength = %d\n"), this->length ())); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("message-type = "))); + ACE_TEXT ("message-type = "))); switch (this->msg_type ()) { case ACE_Name_Request::BIND: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("BIND\n"))); + ACE_TEXT ("BIND\n"))); break; case ACE_Name_Request::REBIND: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("REBIND\n"))); + ACE_TEXT ("REBIND\n"))); break; case ACE_Name_Request::RESOLVE: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("RESOLVE\n"))); + ACE_TEXT ("RESOLVE\n"))); break; case ACE_Name_Request::UNBIND: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("UNBIND\n"))); + ACE_TEXT ("UNBIND\n"))); break; case ACE_Name_Request::LIST_NAMES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_NAMES\n"))); + ACE_TEXT ("LIST_NAMES\n"))); break; case ACE_Name_Request::LIST_VALUES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_VALUES\n"))); + ACE_TEXT ("LIST_VALUES\n"))); break; case ACE_Name_Request::LIST_TYPES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_TYPES\n"))); + ACE_TEXT ("LIST_TYPES\n"))); break; case ACE_Name_Request::LIST_NAME_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_NAME_ENTRIES\n"))); + ACE_TEXT ("LIST_NAME_ENTRIES\n"))); break; case ACE_Name_Request::LIST_VALUE_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_VALUE_ENTRIES\n"))); + ACE_TEXT ("LIST_VALUE_ENTRIES\n"))); break; case ACE_Name_Request::LIST_TYPE_ENTRIES: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("LIST_TYPE_ENTRIES\n"))); + ACE_TEXT ("LIST_TYPE_ENTRIES\n"))); break; default: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("<unknown type> = %d\n"), + ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } if (this->block_forever ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("blocking forever\n"))); + ACE_TEXT ("blocking forever\n"))); else { #if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); #endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_TEXT ("waiting for %d secs and %d usecs\n"), tv.sec (), tv.usec ())); } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("*******\nname_len = %d\n"), + ACE_TEXT ("*******\nname_len = %d\n"), this->name_len ())); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("*******\nvalue_len = %d\n"), + ACE_TEXT ("*******\nvalue_len = %d\n"), this->value_len ())); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("+++++++\n"))); + ACE_TEXT ("+++++++\n"))); #endif /* ACE_HAS_DUMP */ } @@ -550,24 +550,24 @@ ACE_Name_Reply::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Name_Reply::dump"); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"), + ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("type = "))); + ACE_TEXT ("type = "))); switch (this->msg_type ()) { case 0: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("SUCCESS\n"))); + ACE_TEXT ("SUCCESS\n"))); break; case -1: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("FAILURE\n"))); + ACE_TEXT ("FAILURE\n"))); break; default: ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("<unknown type> = %d\n"), + ACE_TEXT ("<unknown type> = %d\n"), this->msg_type ())); break; } diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index 8d0c03c2ef0..47076fc7f6e 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -35,9 +35,9 @@ ACE_Naming_Context::info (ACE_TCHAR **strp, ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t#%s\n"), - ACE_LIB_TEXT ("ACE_Naming_Context"), - ACE_LIB_TEXT ("Proxy for making calls to a Name Server")); + ACE_TEXT ("%s\t#%s\n"), + ACE_TEXT ("ACE_Naming_Context"), + ACE_TEXT ("Proxy for making calls to a Name Server")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; @@ -51,7 +51,7 @@ ACE_Naming_Context::local (void) { ACE_TRACE ("ACE_Naming_Context::local"); return ACE_OS::strcmp (this->netnameserver_host_, - ACE_LIB_TEXT ("localhost")) == 0 + ACE_TEXT ("localhost")) == 0 || ACE_OS::strcmp (this->netnameserver_host_, this->hostname_) == 0; } @@ -105,7 +105,7 @@ ACE_Naming_Context::open (Context_Scope_Type scope_in, int lite) if (ACE_LOG_MSG->op_status () != 0 || this->name_space_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("NAME_SPACE::NAME_SPACE\n")), + ACE_TEXT ("NAME_SPACE::NAME_SPACE\n")), -1); return 0; } @@ -156,8 +156,8 @@ ACE_Naming_Context::ACE_Naming_Context (Context_Scope_Type scope_in, // Initialize. if (this->open (scope_in, lite) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Naming_Context::ACE_Naming_Context"))); } ACE_Name_Options * @@ -393,7 +393,7 @@ ACE_Naming_Context::init (int argc, ACE_TCHAR *argv[]) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_Naming_Context::init\n"))); + ACE_TEXT ("ACE_Naming_Context::init\n"))); this->name_options_->parse_args (argc, argv); return this->open (this->name_options_->context ()); } @@ -403,7 +403,7 @@ ACE_Naming_Context::fini (void) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_Naming_Context::fini\n"))); + ACE_TEXT ("ACE_Naming_Context::fini\n"))); this->close_down (); return 0; } @@ -429,9 +429,9 @@ ACE_Name_Options::ACE_Name_Options (void) if (ACE::get_temp_dir (this->namespace_dir_, MAXPATHLEN) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); - ACE_OS::strcpy (this->namespace_dir_, ACE_LIB_TEXT (".")); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); + ACE_OS::strcpy (this->namespace_dir_, ACE_TEXT (".")); ACE_OS::strcat (this->namespace_dir_, ACE_DIRECTORY_SEPARATOR_STR); } #endif /* ACE_DEFAULT_NAMESPACE_DIR */ @@ -600,18 +600,18 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) // clean it up in the destructor). this->database (this->process_name ()); - ACE_Get_Opt get_opt (argc, argv, ACE_LIB_TEXT ("b:c:dh:l:P:p:s:T:vr")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("b:c:dh:l:P:p:s:T:vr")); for (int c; (c = get_opt ()) != -1; ) switch (c) { case 'c': { - if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("PROC_LOCAL")) == 0) + if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("PROC_LOCAL")) == 0) this->context (ACE_Naming_Context::PROC_LOCAL); - else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("NODE_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("NODE_LOCAL")) == 0) this->context (ACE_Naming_Context::NODE_LOCAL); - else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_LIB_TEXT ("NET_LOCAL")) == 0) + else if (ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT ("NET_LOCAL")) == 0) this->context (ACE_Naming_Context::NET_LOCAL); } break; @@ -642,9 +642,9 @@ ACE_Name_Options::parse_args (int argc, ACE_TCHAR *argv[]) break; case 'T': #if defined (ACE_HAS_TRACE) - if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT ("ON")) == 0) + if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("ON")) == 0) ACE_Trace::start_tracing (); - else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_LIB_TEXT ("OFF")) == 0) + else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT ("OFF")) == 0) ACE_Trace::stop_tracing (); #endif /* ACE_HAS_TRACE */ break; @@ -676,7 +676,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_FACTORY_DEFINE (ACE, ACE_Naming_Context) ACE_STATIC_SVC_DEFINE (ACE_Naming_Context, - ACE_LIB_TEXT ("ACE_Naming_Context"), + ACE_TEXT ("ACE_Naming_Context"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Naming_Context), ACE_Service_Type::DELETE_THIS | diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index bd67a786c09..cf883ac03d6 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -453,8 +453,8 @@ ACE_TSS_Info::dump (void) # if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %u\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("destructor_ = %u\n"), this->destructor_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %u\n"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("destructor_ = %u\n"), this->destructor_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); # endif /* 0 */ # endif /* ACE_HAS_DUMP */ @@ -5192,7 +5192,7 @@ ACE_OS::unique_name (const void *object, // <object>. wchar_t temp_name[ACE_UNIQUE_NAME_LEN]; ACE_OS::sprintf (temp_name, - ACE_LIB_TEXT ("%p%d"), + ACE_TEXT ("%p%d"), object, static_cast <int> (ACE_OS::getpid ())); ACE_OS::strsncpy (name, diff --git a/ACE/ace/OS_NS_dirent.cpp b/ACE/ace/OS_NS_dirent.cpp index 0743ef58fa2..b8c3f3401a6 100644 --- a/ACE/ace/OS_NS_dirent.cpp +++ b/ACE/ace/OS_NS_dirent.cpp @@ -78,9 +78,9 @@ ACE_OS::opendir_emulation (const ACE_TCHAR *filename) if (filename[lastchar-1] != '*') { if (filename[lastchar-1] != '/' && filename[lastchar-1] != '\\') - ACE_OS::strcpy (extra, ACE_LIB_TEXT ("/*")); + ACE_OS::strcpy (extra, ACE_TEXT ("/*")); else - ACE_OS::strcpy (extra, ACE_LIB_TEXT ("*")); + ACE_OS::strcpy (extra, ACE_TEXT ("*")); } } diff --git a/ACE/ace/OS_NS_dlfcn.inl b/ACE/ace/OS_NS_dlfcn.inl index 6c4caeaf3e8..3e11328e562 100644 --- a/ACE/ace/OS_NS_dlfcn.inl +++ b/ACE/ace/OS_NS_dlfcn.inl @@ -35,7 +35,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle) // SunOS4 does not automatically call _fini()! void *ptr; - ACE_OSCALL (::dlsym (handle, ACE_LIB_TEXT ("_fini")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_fini")), void *, 0, ptr); if (ptr != 0) (*((int (*)(void)) ptr)) (); // Call _fini hook explicitly. @@ -140,7 +140,7 @@ ACE_OS::dlopen (const ACE_TCHAR *fname, // Some systems (e.g., SunOS4) do not automatically call _init(), so // we'll have to call it manually. - ACE_OSCALL (::dlsym (handle, ACE_LIB_TEXT ("_init")), void *, 0, ptr); + ACE_OSCALL (::dlsym (handle, ACE_TEXT ("_init")), void *, 0, ptr); if (ptr != 0 && (*((int (*)(void)) ptr)) () == -1) // Call _init hook explicitly. { diff --git a/ACE/ace/OS_NS_stdio.cpp b/ACE/ace/OS_NS_stdio.cpp index 30f8bac0537..a64d7126de7 100644 --- a/ACE/ace/OS_NS_stdio.cpp +++ b/ACE/ace/OS_NS_stdio.cpp @@ -50,22 +50,22 @@ ACE_OS::ace_flock_t::dump (void) const # if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handle_ = %u"), this->handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handle_ = %u"), this->handle_)); # if defined (ACE_WIN32) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nInternal = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternal = %d"), this->overlapped_.Internal)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nInternalHigh = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nInternalHigh = %d"), this->overlapped_.InternalHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nOffsetHigh = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nOffsetHigh = %d"), this->overlapped_.OffsetHigh)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhEvent = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhEvent = %d"), this->overlapped_.hEvent)); # else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_whence = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_whence = %d"), this->lock_.l_whence)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_start = %d"), this->lock_.l_start)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_len = %d"), this->lock_.l_len)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nl_type = %d"), this->lock_.l_type)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_start = %d"), this->lock_.l_start)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_len = %d"), this->lock_.l_len)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nl_type = %d"), this->lock_.l_type)); # endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); # endif /* 0 */ @@ -121,14 +121,14 @@ namespace { switch (x) { - case ACE_LIB_TEXT ('r'): + case ACE_TEXT ('r'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_WRONLY); ACE_SET_BITS (hmode, _O_RDONLY); } break; - case ACE_LIB_TEXT ('w'): + case ACE_TEXT ('w'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_RDONLY); @@ -136,7 +136,7 @@ namespace } ACE_SET_BITS (hmode, _O_CREAT | _O_TRUNC); break; - case ACE_LIB_TEXT ('a'): + case ACE_TEXT ('a'): if (ACE_BIT_DISABLED (hmode, _O_RDWR)) { ACE_CLR_BITS (hmode, _O_RDONLY); @@ -144,15 +144,15 @@ namespace } ACE_SET_BITS (hmode, _O_CREAT | _O_APPEND); break; - case ACE_LIB_TEXT ('+'): + case ACE_TEXT ('+'): ACE_CLR_BITS (hmode, _O_RDONLY | _O_WRONLY); ACE_SET_BITS (hmode, _O_RDWR); break; - case ACE_LIB_TEXT ('t'): + case ACE_TEXT ('t'): ACE_CLR_BITS (hmode, _O_BINARY); ACE_SET_BITS (hmode, _O_TEXT); break; - case ACE_LIB_TEXT ('b'): + case ACE_TEXT ('b'): ACE_CLR_BITS (hmode, _O_TEXT); ACE_SET_BITS (hmode, _O_BINARY); break; diff --git a/ACE/ace/OS_NS_stdlib.cpp b/ACE/ace/OS_NS_stdlib.cpp index 622c57642b1..d60b15be603 100644 --- a/ACE/ace/OS_NS_stdlib.cpp +++ b/ACE/ace/OS_NS_stdlib.cpp @@ -120,13 +120,13 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) ACE_NOTSUP_RETURN (0); #else const ACE_TCHAR * start = 0; - if ((start = ACE_OS::strchr (str, ACE_LIB_TEXT ('$'))) != 0) + if ((start = ACE_OS::strchr (str, ACE_TEXT ('$'))) != 0) { ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ]; size_t var_len = ACE_OS::strcspn (&start[1], - ACE_LIB_TEXT ("$~!#%^&*()-+=\\|/?,.;:'\"`[]{} \t\n\r")); + ACE_TEXT ("$~!#%^&*()-+=\\|/?,.;:'\"`[]{} \t\n\r")); ACE_OS::strncpy (buf, &start[1], var_len); - buf[var_len++] = ACE_LIB_TEXT ('\0'); + buf[var_len++] = ACE_TEXT ('\0'); # if defined (ACE_WIN32) // Always use the ACE_TCHAR for Windows. ACE_TCHAR *temp = ACE_OS::getenv (buf); @@ -164,7 +164,7 @@ ACE_OS::strenvdup (const ACE_TCHAR *str) { ACE_OS::strncpy (p, start, var_len); p += var_len; - *p = ACE_LIB_TEXT ('\0'); + *p = ACE_TEXT ('\0'); } ACE_OS::strcpy (p, &start[var_len]); return (buf_p == buf) ? ACE_OS::strdup (buf) : buf_p; @@ -296,14 +296,14 @@ ACE_OS::mktemp (ACE_TCHAR *s) return 0; else { - ACE_TCHAR *xxxxxx = ACE_OS::strstr (s, ACE_LIB_TEXT ("XXXXXX")); + ACE_TCHAR *xxxxxx = ACE_OS::strstr (s, ACE_TEXT ("XXXXXX")); if (xxxxxx == 0) // the template string doesn't contain "XXXXXX"! return s; else { - ACE_TCHAR unique_letter = ACE_LIB_TEXT ('a'); + ACE_TCHAR unique_letter = ACE_TEXT ('a'); ACE_stat sb; // Find an unused filename for this process. It is assumed @@ -313,20 +313,20 @@ ACE_OS::mktemp (ACE_TCHAR *s) // template). This appears to match the behavior of the // SunOS 5.5 mktemp(). ACE_OS::sprintf (xxxxxx, - ACE_LIB_TEXT ("%05d%c"), + ACE_TEXT ("%05d%c"), ACE_OS::getpid (), unique_letter); while (ACE_OS::stat (s, &sb) >= 0) { - if (++unique_letter <= ACE_LIB_TEXT ('z')) + if (++unique_letter <= ACE_TEXT ('z')) ACE_OS::sprintf (xxxxxx, - ACE_LIB_TEXT ("%05d%c"), + ACE_TEXT ("%05d%c"), ACE_OS::getpid (), unique_letter); else { // maximum of 26 unique files per template, per process - ACE_OS::sprintf (xxxxxx, ACE_LIB_TEXT ("%s"), ACE_LIB_TEXT ("")); + ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%s"), ACE_TEXT ("")); return s; } } @@ -675,7 +675,7 @@ ACE_OS::mkstemp_emulation (ACE_TCHAR * s) } // The "XXXXXX" template to be filled in. - ACE_TCHAR * const t = ACE_OS::strstr (s, ACE_LIB_TEXT ("XXXXXX")); + ACE_TCHAR * const t = ACE_OS::strstr (s, ACE_TEXT ("XXXXXX")); if (t == 0) { diff --git a/ACE/ace/OS_NS_sys_mman.inl b/ACE/ace/OS_NS_sys_mman.inl index e41ee829d14..d241c922c92 100644 --- a/ACE/ace/OS_NS_sys_mman.inl +++ b/ACE/ace/OS_NS_sys_mman.inl @@ -245,7 +245,7 @@ ACE_OS::shm_open (const ACE_TCHAR *filename, // slashes, so replace all other / by _ ACE_TCHAR buf [MAXPATHLEN + 1]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s"), + ACE_TEXT ("%s"), filename); for (size_t i = 1; i < MAXPATHLEN + 1; i++) { @@ -275,7 +275,7 @@ ACE_OS::shm_unlink (const ACE_TCHAR *path) // slashes, so replace all other / by _ ACE_TCHAR buf [MAXPATHLEN + 1]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s"), + ACE_TEXT ("%s"), path); for (size_t i = 1; i < MAXPATHLEN + 1; i++) { diff --git a/ACE/ace/OS_NS_sys_socket.cpp b/ACE/ace/OS_NS_sys_socket.cpp index 0069053c5ce..bbf468f4e63 100644 --- a/ACE/ace/OS_NS_sys_socket.cpp +++ b/ACE/ace/OS_NS_sys_socket.cpp @@ -110,10 +110,10 @@ ACE_OS::socket_init (int version_high, int version_low) if (error != 0) # if defined (ACE_HAS_WINCE) { - ACE_TCHAR fmt[] = ACE_LIB_TEXT ("%s failed, WSAGetLastError returned %d"); + ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::sprintf (buf, fmt, ACE_LIB_TEXT ("WSAStartup"), error); - ::MessageBox (0, buf, ACE_LIB_TEXT ("WSAStartup failed!"), MB_OK); + ACE_OS::sprintf (buf, fmt, ACE_TEXT ("WSAStartup"), error); + ::MessageBox (0, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK); } # else ACE_OS::fprintf (stderr, @@ -141,10 +141,10 @@ ACE_OS::socket_fini (void) { int error = ::WSAGetLastError (); # if defined (ACE_HAS_WINCE) - ACE_TCHAR fmt[] = ACE_LIB_TEXT ("%s failed, WSAGetLastError returned %d"); + ACE_TCHAR fmt[] = ACE_TEXT ("%s failed, WSAGetLastError returned %d"); ACE_TCHAR buf[80]; // @@ Eliminate magic number. - ACE_OS::sprintf (buf, fmt, ACE_LIB_TEXT ("WSACleanup"), error); - ::MessageBox (0, buf , ACE_LIB_TEXT ("WSACleanup failed!"), MB_OK); + ACE_OS::sprintf (buf, fmt, ACE_TEXT ("WSACleanup"), error); + ::MessageBox (0, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK); # else ACE_OS::fprintf (stderr, "ACE_OS::socket_fini; WSACleanup failed, " diff --git a/ACE/ace/OS_NS_sys_utsname.cpp b/ACE/ace/OS_NS_sys_utsname.cpp index c84e209737f..588469780f3 100644 --- a/ACE/ace/OS_NS_sys_utsname.cpp +++ b/ACE/ace/OS_NS_sys_utsname.cpp @@ -167,13 +167,13 @@ ACE_OS::uname (ACE_utsname *name) if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 0) { ACE_OS::strcpy (name->release, "Windows 95"); - if (vinfo.szCSDVersion[1] == ACE_LIB_TEXT('C')) + if (vinfo.szCSDVersion[1] == ACE_TEXT('C')) ACE_OS::strcat (name->release, " OSR2"); } else if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 10) { ACE_OS::strcpy (name->release, "Windows 98"); - if (vinfo.szCSDVersion[1] == ACE_LIB_TEXT('A')) + if (vinfo.szCSDVersion[1] == ACE_TEXT('A')) ACE_OS::strcat (name->release, " SE"); } else if (vinfo.dwMajorVersion == 4 && vinfo.dwMinorVersion == 90) diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index a7abc3a1b4f..18f5b73c15c 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -22,32 +22,32 @@ namespace { ACE_TCHAR const * const ACE_OS_day_of_week_name[] = { - ACE_LIB_TEXT ("Sun"), - ACE_LIB_TEXT ("Mon"), - ACE_LIB_TEXT ("Tue"), - ACE_LIB_TEXT ("Wed"), - ACE_LIB_TEXT ("Thu"), - ACE_LIB_TEXT ("Fri"), - ACE_LIB_TEXT ("Sat") + ACE_TEXT ("Sun"), + ACE_TEXT ("Mon"), + ACE_TEXT ("Tue"), + ACE_TEXT ("Wed"), + ACE_TEXT ("Thu"), + ACE_TEXT ("Fri"), + ACE_TEXT ("Sat") }; ACE_TCHAR const * const ACE_OS_month_name[] = { - ACE_LIB_TEXT ("Jan"), - ACE_LIB_TEXT ("Feb"), - ACE_LIB_TEXT ("Mar"), - ACE_LIB_TEXT ("Apr"), - ACE_LIB_TEXT ("May"), - ACE_LIB_TEXT ("Jun"), - ACE_LIB_TEXT ("Jul"), - ACE_LIB_TEXT ("Aug"), - ACE_LIB_TEXT ("Sep"), - ACE_LIB_TEXT ("Oct"), - ACE_LIB_TEXT ("Nov"), - ACE_LIB_TEXT ("Dec") + ACE_TEXT ("Jan"), + ACE_TEXT ("Feb"), + ACE_TEXT ("Mar"), + ACE_TEXT ("Apr"), + ACE_TEXT ("May"), + ACE_TEXT ("Jun"), + ACE_TEXT ("Jul"), + ACE_TEXT ("Aug"), + ACE_TEXT ("Sep"), + ACE_TEXT ("Oct"), + ACE_TEXT ("Nov"), + ACE_TEXT ("Dec") }; - static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_LIB_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); + static ACE_TCHAR const ACE_OS_CTIME_R_FMTSTR[] = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n"); } /* end blank namespace */ #endif /* ACE_HAS_WINCE */ diff --git a/ACE/ace/OS_NS_unistd.cpp b/ACE/ace/OS_NS_unistd.cpp index cf7b498dda4..31be4531ace 100644 --- a/ACE/ace/OS_NS_unistd.cpp +++ b/ACE/ace/OS_NS_unistd.cpp @@ -60,7 +60,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, #if !defined (ACE_LACKS_ENV) // Account for environment variables. if (substitute_env_args - && ACE_OS::strchr (argv[i], ACE_LIB_TEXT ('$')) != 0) + && ACE_OS::strchr (argv[i], ACE_TEXT ('$')) != 0) { if (argv_p == argv) { @@ -82,7 +82,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, } #endif /* ACE_LACKS_ENV */ if (quote_args - && ACE_OS::strchr (argv_p[i], ACE_LIB_TEXT (' ')) != 0) + && ACE_OS::strchr (argv_p[i], ACE_TEXT (' ')) != 0) { if (argv_p == argv) { @@ -96,10 +96,10 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, } int quotes = 0; ACE_TCHAR *temp = argv_p[i]; - if (ACE_OS::strchr (temp, ACE_LIB_TEXT ('"')) != 0) + if (ACE_OS::strchr (temp, ACE_TEXT ('"')) != 0) { for (int j = 0; temp[j] != 0; ++j) - if (temp[j] == ACE_LIB_TEXT ('"')) + if (temp[j] == ACE_TEXT ('"')) ++quotes; } argv_p[i] = @@ -112,24 +112,24 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, } ACE_TCHAR *end = argv_p[i]; - *end++ = ACE_LIB_TEXT ('"'); + *end++ = ACE_TEXT ('"'); if (quotes > 0) { for (ACE_TCHAR *p = temp; *p != 0; *end++ = *p++) - if (*p == ACE_LIB_TEXT ('"')) - *end++ = ACE_LIB_TEXT ('\\'); + if (*p == ACE_TEXT ('"')) + *end++ = ACE_TEXT ('\\'); - *end++ = ACE_LIB_TEXT ('\0'); + *end++ = ACE_TEXT ('\0'); } else end = ACE_OS::strecpy (end, temp); - end[-1] = ACE_LIB_TEXT ('"'); + end[-1] = ACE_TEXT ('"'); - *end = ACE_LIB_TEXT ('\0'); + *end = ACE_TEXT ('\0'); if (temp != argv[i]) ACE_OS::free (temp); } @@ -147,7 +147,7 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, 0); // Initial null charater to make it a null string. - buf[0] = ACE_LIB_TEXT ('\0'); + buf[0] = ACE_TEXT ('\0'); ACE_TCHAR *end = buf; for (int i = 0; i < argc; ++i) @@ -158,10 +158,10 @@ ACE_OS::argv_to_string (ACE_TCHAR **argv, // Replace the null char that strecpy put there with white // space. - end[-1] = ACE_LIB_TEXT (' '); + end[-1] = ACE_TEXT (' '); } // Null terminate the string. - *end = ACE_LIB_TEXT ('\0'); + *end = ACE_TEXT ('\0'); if (argv_p != argv) ACE_OS::free (argv_p); @@ -693,30 +693,30 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, // First pass: count arguments. // '#' is the start-comment token.. - while (*cp != ACE_LIB_TEXT ('\0') && *cp != ACE_LIB_TEXT ('#')) + while (*cp != ACE_TEXT ('\0') && *cp != ACE_TEXT ('#')) { // Skip whitespace.. while (ACE_OS::ace_isspace (*cp)) ++cp; // Increment count and move to next whitespace.. - if (*cp != ACE_LIB_TEXT ('\0')) + if (*cp != ACE_TEXT ('\0')) ++argc; - while (*cp != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*cp)) + while (*cp != ACE_TEXT ('\0') && !ACE_OS::ace_isspace (*cp)) { // Grok quotes.... - if (*cp == ACE_LIB_TEXT ('\'') || *cp == ACE_LIB_TEXT ('"')) + if (*cp == ACE_TEXT ('\'') || *cp == ACE_TEXT ('"')) { ACE_TCHAR quote = *cp; // Scan past the string.. - for (++cp; *cp != ACE_LIB_TEXT ('\0') - && (*cp != quote || cp[-1] == ACE_LIB_TEXT ('\\')); ++cp) + for (++cp; *cp != ACE_TEXT ('\0') + && (*cp != quote || cp[-1] == ACE_TEXT ('\\')); ++cp) continue; // '\0' implies unmatched quote.. - if (*cp == ACE_LIB_TEXT ('\0')) + if (*cp == ACE_TEXT ('\0')) { --argc; break; @@ -755,15 +755,15 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, // Copy next argument and move to next whitespace.. cp = argp; - while (*ptr != ACE_LIB_TEXT ('\0') && !ACE_OS::ace_isspace (*ptr)) - if (*ptr == ACE_LIB_TEXT ('\'') || *ptr == ACE_LIB_TEXT ('"')) + while (*ptr != ACE_TEXT ('\0') && !ACE_OS::ace_isspace (*ptr)) + if (*ptr == ACE_TEXT ('\'') || *ptr == ACE_TEXT ('"')) { ACE_TCHAR quote = *ptr++; - while (*ptr != ACE_LIB_TEXT ('\0') - && (*ptr != quote || ptr[-1] == ACE_LIB_TEXT ('\\'))) + while (*ptr != ACE_TEXT ('\0') + && (*ptr != quote || ptr[-1] == ACE_TEXT ('\\'))) { - if (*ptr == quote && ptr[-1] == ACE_LIB_TEXT ('\\')) --cp; + if (*ptr == quote && ptr[-1] == ACE_TEXT ('\\')) --cp; *cp++ = *ptr++; } @@ -773,7 +773,7 @@ ACE_OS::string_to_argv (ACE_TCHAR *buf, else *cp++ = *ptr++; - *cp = ACE_LIB_TEXT ('\0'); + *cp = ACE_TEXT ('\0'); #if !defined (ACE_LACKS_ENV) // Check for environment variable substitution here. diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 3ffb57f2366..a1b54738888 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -42,7 +42,7 @@ ACE_OS::access (const char *path, int amode) // Hard coded read access here. ACE_UNUSED_ARG (amode); FILE* handle = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(path), - ACE_LIB_TEXT ("r")); + ACE_TEXT ("r")); if (handle != 0) { ACE_OS::fclose (handle); diff --git a/ACE/ace/OS_main.cpp b/ACE/ace/OS_main.cpp index 5d3c2017d7b..6d931fbd4b6 100644 --- a/ACE/ace/OS_main.cpp +++ b/ACE/ace/OS_main.cpp @@ -111,7 +111,7 @@ int ACE_Main_Base::run (HINSTANCE, int) { ACE_TCHAR cmdline[1024]; - ACE_OS::strcpy (cmdline, ACE_LIB_TEXT ("program ")); + ACE_OS::strcpy (cmdline, ACE_TEXT ("program ")); ACE_OS::strcat (cmdline, ACE_TEXT_WCHAR_TO_TCHAR (lpCmdLine)); ACE_ARGV ce_argv (cmdline); ACE::init (); diff --git a/ACE/ace/Obchunk.cpp b/ACE/ace/Obchunk.cpp index 0d1de440fcb..7cb00a4dfe6 100644 --- a/ACE/ace/Obchunk.cpp +++ b/ACE/ace/Obchunk.cpp @@ -19,8 +19,8 @@ ACE_Obchunk::dump (void) const ACE_TRACE ("ACE_Obchunk::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("end_ = %x\n"), this->end_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("cur_ = %x\n"), this->cur_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("end_ = %x\n"), this->end_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("cur_ = %x\n"), this->cur_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index 887176dc6f0..086e1a22d80 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -117,7 +117,7 @@ private: ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) { ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer, - ACE_LIB_TEXT ("ACE_Service_Manager"), + ACE_TEXT ("ACE_Service_Manager"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Service_Manager), ACE_Service_Type::DELETE_THIS | @@ -159,9 +159,9 @@ LONG _stdcall ACE_UnhandledExceptionFilter (PEXCEPTION_POINTERS pExceptionInfo) DWORD dwExceptionCode = pExceptionInfo->ExceptionRecord->ExceptionCode; if (dwExceptionCode == EXCEPTION_ACCESS_VIOLATION) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("\nERROR: ACCESS VIOLATION\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: ACCESS VIOLATION\n"))); else - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("\nERROR: UNHANDLED EXCEPTION\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("\nERROR: UNHANDLED EXCEPTION\n"))); return EXCEPTION_EXECUTE_HANDLER; } diff --git a/ACE/ace/Object_Manager_Base.cpp b/ACE/ace/Object_Manager_Base.cpp index 1f7c89f422d..866f999871b 100644 --- a/ACE/ace/Object_Manager_Base.cpp +++ b/ACE/ace/Object_Manager_Base.cpp @@ -17,7 +17,7 @@ int ACE_SEH_Default_Exception_Selector (void *) { #if 0 ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) Win32 structured exception exiting thread\n"))); + ACE_TEXT ("(%t) Win32 structured exception exiting thread\n"))); #endif /* 0 */ // this is only windows and only used here, // defined in ace/config-win32-common.h. @@ -216,21 +216,21 @@ ACE_OS_Object_Manager::init (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK")); + __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) if (ACE_OS::recursive_mutex_init // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); ACE_OS_PREALLOCATE_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) if (ACE_OS::thread_mutex_init // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); + __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK")); # if defined (ACE_HAS_TSS_EMULATION) ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) @@ -238,7 +238,7 @@ ACE_OS_Object_Manager::init (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); # if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) ACE_OS_PREALLOCATE_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) @@ -246,7 +246,7 @@ ACE_OS_Object_Manager::init (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */ # endif /* ACE_HAS_TSS_EMULATION */ # endif /* ACE_MT_SAFE */ @@ -323,7 +323,7 @@ ACE_OS_Object_Manager::fini (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_OS_MONITOR_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_OS_MONITOR_LOCK")); + __LINE__, ACE_TEXT ("ACE_OS_MONITOR_LOCK")); # endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t, ACE_OS_MONITOR_LOCK) @@ -332,7 +332,7 @@ ACE_OS_Object_Manager::fini (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_CLEANUP_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_CLEANUP_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_CLEANUP_LOCK")); # endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_CLEANUP_LOCK) @@ -341,7 +341,7 @@ ACE_OS_Object_Manager::fini (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object [ACE_LOG_MSG_INSTANCE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK ")); + __LINE__, ACE_TEXT ("ACE_LOG_MSG_INSTANCE_LOCK ")); # endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t, ACE_LOG_MSG_INSTANCE_LOCK) @@ -351,7 +351,7 @@ ACE_OS_Object_Manager::fini (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_KEY_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_KEY_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_KEY_LOCK")); # endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_KEY_LOCK) @@ -361,7 +361,7 @@ ACE_OS_Object_Manager::fini (void) // This line must not be broken to avoid tickling a bug with SunC++'s preprocessor. (reinterpret_cast <ACE_recursive_thread_mutex_t *> (ACE_OS_Object_Manager::preallocated_object[ACE_TSS_BASE_LOCK])) != 0) ACE_OS_Object_Manager::print_error_message ( - __LINE__, ACE_LIB_TEXT ("ACE_TSS_BASE_LOCK")); + __LINE__, ACE_TEXT ("ACE_TSS_BASE_LOCK")); # endif /* ! ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK */ ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t, ACE_TSS_BASE_LOCK) @@ -429,7 +429,7 @@ ACE_OS_Object_Manager::print_error_message (unsigned int line_number, 0); ::MessageBox (0, lpMsgBuf, - ACE_LIB_TEXT ("ACE_OS error"), + ACE_TEXT ("ACE_OS error"), MB_OK); #endif } diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp index 2aab729d9a2..a54120fc8cc 100644 --- a/ACE/ace/Obstack_T.cpp +++ b/ACE/ace/Obstack_T.cpp @@ -26,9 +26,9 @@ ACE_Obstack_T<CHAR>::dump (void) const ACE_TRACE ("ACE_Obstack_T<CHAR>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %d\n"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("head_ = %x\n"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("curr_ = %x\n"), this->curr_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("head_ = %x\n"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("curr_ = %x\n"), this->curr_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -193,7 +193,7 @@ ACE_Obstack_T<CHAR>::unwind_i (void* obj) } else if (obj != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Deletion of non-existent object.\n%a"))); + ACE_TEXT ("Deletion of non-existent object.\n%a"))); } template <class CHAR> void diff --git a/ACE/ace/PI_Malloc.cpp b/ACE/ace/PI_Malloc.cpp index 6486bdb22eb..8637fbd211f 100644 --- a/ACE/ace/PI_Malloc.cpp +++ b/ACE/ace/PI_Malloc.cpp @@ -26,8 +26,8 @@ ACE_PI_Control_Block::ACE_Malloc_Header::dump (void) const ACE_TRACE ("ACE_PI_Control_Block::ACE_Malloc_Header::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize = %d\n"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_block = %x"), (ACE_Malloc_Header *) this->next_block_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize = %d\n"), this->size_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -37,20 +37,20 @@ ACE_PI_Control_Block::print_alignment_info (void) { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_PI_Control_Block::ACE_Control_Block::print_alignment_info"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Start ---> ACE_PI_Control_Block::print_alignment_info:\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Sizeof ptr: %d\n") - ACE_LIB_TEXT ("Sizeof size_t: %d\n") - ACE_LIB_TEXT ("Sizeof long: %d\n") - ACE_LIB_TEXT ("Sizeof double: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") - ACE_LIB_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n") - ACE_LIB_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_BYTES: %d\n") - ACE_LIB_TEXT ("Sizeof (MALLOC_HEADER): %d\n") - ACE_LIB_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), + ACE_TEXT ("Sizeof ptr: %d\n") + ACE_TEXT ("Sizeof size_t: %d\n") + ACE_TEXT ("Sizeof long: %d\n") + ACE_TEXT ("Sizeof double: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_ALIGN: %d\n") + ACE_TEXT ("sizeof ACE_MALLOC_PADDING: %d\n") + ACE_TEXT ("Sizeof ACE_MALLOC_HEADER_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_PI_MALLOC_PADDING_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_SIZE: %d\n") + ACE_TEXT ("Sizeof ACE_PI_CONTROL_BLOCK_ALIGN_BYTES: %d\n") + ACE_TEXT ("Sizeof (MALLOC_HEADER): %d\n") + ACE_TEXT ("Sizeof (CONTROL_BLOCK): %d\n"), sizeof (char *), sizeof (size_t), sizeof (long), @@ -64,7 +64,7 @@ ACE_PI_Control_Block::print_alignment_info (void) sizeof (ACE_Malloc_Header), sizeof (ACE_PI_Control_Block) )); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("End <--- ACE_PI_Control_Block::print_alignment_info:\n"))); #endif /* ACE_HAS_DUMP */ } @@ -75,22 +75,22 @@ ACE_PI_Control_Block::dump (void) const ACE_TRACE ("ACE_PI_Control_Block::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Name Node:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Name Node:\n"))); for (ACE_Name_Node *nextn = this->name_head_; nextn != 0; nextn = nextn->next_) nextn->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("freep_ = %x"), (ACE_Malloc_Header *) this->freep_)); this->base_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nMalloc Header:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nMalloc Header:\n"))); for (ACE_Malloc_Header *nexth = ((ACE_Malloc_Header *)this->freep_)->next_block_; nexth != 0 && nexth != &this->base_; nexth = nexth->next_block_) nexth->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -148,13 +148,13 @@ ACE_PI_Control_Block::ACE_Name_Node::dump (void) const ACE_TRACE ("ACE_PI_Control_Block::ACE_Name_Node::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("pointer = %x"), (const char *) this->pointer_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("pointer = %x"), (const char *) this->pointer_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nnext_ = %x"), (ACE_Name_Node *) this->next_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("\nname_ = (%x, %s)"), + ACE_TEXT("\nname_ = (%x, %s)"), (const char *) this->name_, (const char *) this->name_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/POSIX_Asynch_IO.cpp b/ACE/ace/POSIX_Asynch_IO.cpp index 48943aaa544..551293f6215 100644 --- a/ACE/ace/POSIX_Asynch_IO.cpp +++ b/ACE/ace/POSIX_Asynch_IO.cpp @@ -418,8 +418,8 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block, if (bytes_to_write == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); ACE_POSIX_Asynch_Write_Stream_Result *result = 0; @@ -529,8 +529,8 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, if ( bytes_to_read == 0 ) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Read_File::read:") - ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), + ACE_TEXT ("ACE_POSIX_Asynch_Read_File::read:") + ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), -1); ACE_POSIX_Asynch_Read_File_Result *result = 0; @@ -656,8 +656,8 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, if (bytes_to_write == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_File::write:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_POSIX_Asynch_Write_File::write:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); ACE_POSIX_Asynch_Write_File_Result *result = 0; @@ -814,8 +814,8 @@ ACE_POSIX_Asynch_Accept::open (const ACE_Handler::Proxy_Ptr &handler_proxy, // we could not create a new handler without closing the previous if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:") - ACE_LIB_TEXT("acceptor already open \n")), + ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::open:") + ACE_TEXT("acceptor already open \n")), -1); if (-1 == ACE_POSIX_Asynch_Operation::open (handler_proxy, @@ -855,8 +855,8 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block, if (!this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::accept") - ACE_LIB_TEXT("acceptor was not opened before\n")), + ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Accept::accept") + ACE_TEXT("acceptor was not opened before\n")), -1); // Sanity check: make sure that enough space has been allocated by @@ -898,8 +898,8 @@ ACE_POSIX_Asynch_Accept::accept (ACE_Message_Block &message_block, if (this->result_queue_.enqueue_tail (result) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Accept::accept: %p\n") - ACE_LIB_TEXT ("enqueue_tail"))); + ACE_TEXT ("ACE_POSIX_Asynch_Accept::accept: %p\n") + ACE_TEXT ("enqueue_tail"))); delete result; // to avoid memory leak return -1; } @@ -956,9 +956,9 @@ ACE_POSIX_Asynch_Accept::cancel_uncompleted (int flg_notify) if (this->posix_proactor ()->post_completion (result) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("(%P | %t):%p\n"), - ACE_LIB_TEXT("ACE_POSIX_Asynch_Accept::") - ACE_LIB_TEXT("cancel_uncompleted") + ACE_TEXT("(%P | %t):%p\n"), + ACE_TEXT("ACE_POSIX_Asynch_Accept::") + ACE_TEXT("cancel_uncompleted") )); } } @@ -1083,9 +1083,9 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) // Deregister this info pertaining to this accept call. if (this->result_queue_.dequeue_head (result) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT("ACE_POSIX_Asynch_Accept::handle_input:") - ACE_LIB_TEXT( " dequeueing failed"))); + ACE_TEXT("%N:%l:(%P | %t):%p\n"), + ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input:") + ACE_TEXT( " dequeueing failed"))); // Disable the handle in the reactor if no more accepts are pending. if (this->result_queue_.size () == 0) @@ -1113,9 +1113,9 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) { result->set_error (errno); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") - ACE_LIB_TEXT("accept"))); + ACE_TEXT("%N:%l:(%P | %t):%p\n"), + ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") + ACE_TEXT("accept"))); // Notify client as usual, "AIO" finished with errors } @@ -1127,9 +1127,9 @@ ACE_POSIX_Asynch_Accept::handle_input (ACE_HANDLE /* fd */) // Send the Result through the notification pipe. if (this->posix_proactor ()->post_completion (result) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") - ACE_LIB_TEXT(" <post_completion> failed"))); + ACE_TEXT("Error:(%P | %t):%p\n"), + ACE_TEXT("ACE_POSIX_Asynch_Accept::handle_input: ") + ACE_TEXT(" <post_completion> failed"))); return 0; } @@ -1253,8 +1253,8 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (this->flg_open_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("%N:%l:ACE_POSIX_Asynch_Connect::connect") - ACE_LIB_TEXT("connector was not opened before\n")), + ACE_TEXT("%N:%l:ACE_POSIX_Asynch_Connect::connect") + ACE_TEXT("connector was not opened before\n")), -1); // Common code for both WIN and POSIX. @@ -1287,9 +1287,9 @@ ACE_POSIX_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (this->result_map_.bind (connect_handle, result) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:%p\n"), - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Connect::connect:") - ACE_LIB_TEXT ("bind"))); + ACE_TEXT ("%N:%l:%p\n"), + ACE_TEXT ("ACE_POSIX_Asynch_Connect::connect:") + ACE_TEXT ("bind"))); result->set_error (EFAULT); return post_result (result, true); @@ -1333,9 +1333,9 @@ int ACE_POSIX_Asynch_Connect::post_result (ACE_POSIX_Asynch_Connect_Result * res return 0; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::post_result: ") - ACE_LIB_TEXT(" <post_completion> failed"))); + ACE_TEXT("Error:(%P | %t):%p\n"), + ACE_TEXT("ACE_POSIX_Asynch_Connect::post_result: ") + ACE_TEXT(" <post_completion> failed"))); } ACE_HANDLE handle = result->connect_handle (); @@ -1378,8 +1378,8 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT("socket")), + ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT("socket")), -1); } @@ -1396,8 +1396,8 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT("setsockopt")), + ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT("setsockopt")), -1); } } @@ -1412,8 +1412,8 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT("bind")), + ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT("bind")), -1); } } @@ -1424,8 +1424,8 @@ ACE_POSIX_Asynch_Connect::connect_i (ACE_POSIX_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n") - ACE_LIB_TEXT("set_flags")), + ACE_TEXT("ACE_POSIX_Asynch_Connect::connect_i: %p\n") + ACE_TEXT("set_flags")), -1); } @@ -2380,8 +2380,8 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, if (len == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_POSIX_Asynch_Write_Stream::write:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); ACE_POSIX_Asynch_Write_Dgram_Result *result = 0; diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp index 9c4d4fd00bd..5972cb840d2 100644 --- a/ACE/ace/POSIX_Proactor.cpp +++ b/ACE/ace/POSIX_Proactor.cpp @@ -741,9 +741,9 @@ ACE_AIOCB_Notify_Pipe_Manager::notify () if (errno != EWOULDBLOCK) #if 0 ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P %t):%p\n"), - ACE_LIB_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::notify") - ACE_LIB_TEXT ("Error:Writing on to notify pipe failed"))); + ACE_TEXT ("(%P %t):%p\n"), + ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::notify") + ACE_TEXT ("Error:Writing on to notify pipe failed"))); #endif /* 0 */ return -1; } @@ -769,9 +769,9 @@ ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream 0, // ACT 0)) // Priority ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:") - ACE_LIB_TEXT ("Read from pipe failed"))); + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:") + ACE_TEXT ("Read from pipe failed"))); // 2. Do the upcalls @@ -916,7 +916,7 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"), + ACE_TEXT("slot=%d op=%s status=%d xfercnt=%d %s\n"), ai, op, error_status, @@ -939,8 +939,8 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void) // segmentation fault! ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n") - ACE_LIB_TEXT(" number pending AIO=%d\n"), + ACE_TEXT("ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list\n") + ACE_TEXT(" number pending AIO=%d\n"), num_pending)); delete [] this->aiocb_list_; @@ -1006,7 +1006,7 @@ void ACE_POSIX_AIOCB_Proactor::check_max_aio_num () #if defined(__sgi) ACE_DEBUG((LM_DEBUG, - ACE_LIB_TEXT( "SGI IRIX specific: aio_init!\n"))); + ACE_TEXT( "SGI IRIX specific: aio_init!\n"))); //typedef struct aioinit { // int aio_threads; /* The number of aio threads to start (5) */ @@ -1194,8 +1194,8 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds) if (errno != EAGAIN && // Timeout errno != EINTR ) // Interrupted call ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P|%t)::%p\n"), - ACE_LIB_TEXT ("handle_events: aio_suspend failed"))); + ACE_TEXT ("%N:%l:(%P|%t)::%p\n"), + ACE_TEXT ("handle_events: aio_suspend failed"))); // let continue work // we should check "post_completed" queue } @@ -1327,8 +1327,8 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result, default: ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P|%t)::") - ACE_LIB_TEXT ("start_aio: Invalid op code %d\n"), + ACE_TEXT ("%N:%l:(%P|%t)::") + ACE_TEXT ("start_aio: Invalid op code %d\n"), op), -1); } @@ -1429,15 +1429,15 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) switch (result->aio_lio_opcode ) { case LIO_READ : - ptype = ACE_LIB_TEXT ("read "); + ptype = ACE_TEXT ("read "); ret_val = aio_read (result); break; case LIO_WRITE : - ptype = ACE_LIB_TEXT ("write"); + ptype = ACE_TEXT ("write"); ret_val = aio_write (result); break; default: - ptype = ACE_LIB_TEXT ("?????"); + ptype = ACE_TEXT ("?????"); ret_val = -1; break; } @@ -1450,9 +1450,9 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) ret_val = 1; else ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio_i: aio_%s %p\n"), + ACE_TEXT ("%N:%l:(%P | %t)::start_aio_i: aio_%s %p\n"), ptype, - ACE_LIB_TEXT ("queueing failed"))); + ACE_TEXT ("queueing failed"))); } return ret_val; @@ -1627,8 +1627,8 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (size_t max_aio_operations) // Add the signal number to the signal set. if (ACE_OS::sigaddset (&this->RT_completion_signals_, ACE_SIGRTMIN) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"), - ACE_LIB_TEXT ("sigaddset"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_POSIX_SIG_Proactor: %p\n"), + ACE_TEXT ("sigaddset"))); this->block_signals (); // Set up the signal action for SIGRTMIN. this->setup_signal_handler (ACE_SIGRTMIN); @@ -1949,10 +1949,10 @@ ACE_POSIX_SIG_Proactor::handle_events_i (const ACE_Time_Value *timeout) // or message queue could also generate it ! // So print the message and check our completions ACE_ERROR ((LM_DEBUG, - ACE_LIB_TEXT ("%N:%l:(%P | %t): ") - ACE_LIB_TEXT ("ACE_POSIX_SIG_Proactor::handle_events: ") - ACE_LIB_TEXT ("Unexpected signal code (%d) returned ") - ACE_LIB_TEXT ("from sigwait; expecting %d\n"), + ACE_TEXT ("%N:%l:(%P | %t): ") + ACE_TEXT ("ACE_POSIX_SIG_Proactor::handle_events: ") + ACE_TEXT ("Unexpected signal code (%d) returned ") + ACE_TEXT ("from sigwait; expecting %d\n"), result_sigwait, sig_info.si_code)); flg_aio = 1; } diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index 19e4fff9810..81b84dfddb7 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -91,7 +91,7 @@ ACE_Pagefile_Memory_Pool::ACE_Pagefile_Memory_Pool (const ACE_TCHAR *backing_sto if (update_backing_store_name && ACE_OS::strlen (this->backing_store_name_) < sizeof this->backing_store_name_) ACE_OS::strcat (this->backing_store_name_, - ACE_LIB_TEXT ("_")); + ACE_TEXT ("_")); } void * diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp index acfd3d71da4..376866af7fb 100644 --- a/ACE/ace/Parse_Node.cpp +++ b/ACE/ace/Parse_Node.cpp @@ -42,7 +42,7 @@ ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) Did stream on %s, error = %d\n"), + ACE_TEXT ("(%P|%t) Did stream on %s, error = %d\n"), this->node_->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -81,7 +81,7 @@ ACE_Parse_Node::link (ACE_Parse_Node *n) ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops, const ACE_Parse_Node *str_mods) - : ACE_Parse_Node ((str_ops == 0 ? ACE_LIB_TEXT ("<unknown>") : str_ops->name ())), + : ACE_Parse_Node ((str_ops == 0 ? ACE_TEXT ("<unknown>") : str_ops->name ())), node_ (str_ops), mods_ (str_mods) { @@ -119,7 +119,7 @@ ACE_Parse_Node::print (void) const ACE_TRACE ("ACE_Parse_Node::print"); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("svc = %s\n"), + ACE_TEXT ("svc = %s\n"), this->name ())); if (this->next_) @@ -185,7 +185,7 @@ ACE_Suspend_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("did suspend on %s, error = %d\n"), + ACE_TEXT ("did suspend on %s, error = %d\n"), this->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -202,7 +202,7 @@ ACE_Resume_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("did resume on %s, error = %d\n"), + ACE_TEXT ("did resume on %s, error = %d\n"), this->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -239,8 +239,8 @@ ACE_Remove_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) Remove_Node::apply") - ACE_LIB_TEXT (" - did remove on %s, error = %d\n"), + ACE_TEXT ("ACE (%P|%t) Remove_Node::apply") + ACE_TEXT (" - did remove on %s, error = %d\n"), this->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -267,8 +267,8 @@ ACE_Dynamic_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) Dynamic_Node::apply") - ACE_LIB_TEXT (" - Did dynamic on %s (yyerrno=%d)\n"), + ACE_TEXT ("ACE (%P|%t) Dynamic_Node::apply") + ACE_TEXT (" - Did dynamic on %s (yyerrno=%d)\n"), this->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -337,8 +337,8 @@ ACE_Static_Node::apply (ACE_Service_Gestalt *config, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) Static_Node::apply -") - ACE_LIB_TEXT (" Did static on %s (yyerrno=%d)\n"), + ACE_TEXT ("ACE (%P|%t) Static_Node::apply -") + ACE_TEXT (" Did static on %s (yyerrno=%d)\n"), this->name (), yyerrno)); #endif /* ACE_NLOGGING */ @@ -409,7 +409,7 @@ ACE_Location_Node::open_dll (int & yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) LN::open_dll - path=%s\n"), + ACE_TEXT ("ACE (%P|%t) LN::open_dll - path=%s\n"), this->pathname ())); #endif /* ACE_NLOGGING */ @@ -420,9 +420,9 @@ ACE_Location_Node::open_dll (int & yyerrno) #ifndef ACE_NLOGGING ACE_TCHAR *errmsg = this->dll_.error (); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"), + ACE_TEXT ("ACE (%P|%t) LN::open_dll - Failed to open %s: %s\n"), this->pathname (), - errmsg ? errmsg : ACE_LIB_TEXT ("no error reported"))); + errmsg ? errmsg : ACE_TEXT ("no error reported"))); #endif /* ACE_NLOGGING */ return -1; @@ -476,10 +476,10 @@ ACE_Object_Node::symbol (ACE_Service_Gestalt *, #ifndef ACE_NLOGGING ACE_TCHAR *errmsg = this->dll_.error (); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) DLL::symbol -") - ACE_LIB_TEXT (" Failed for object %s: %s\n"), + ACE_TEXT ("ACE (%P|%t) DLL::symbol -") + ACE_TEXT (" Failed for object %s: %s\n"), object_name, - errmsg ? errmsg : ACE_LIB_TEXT ("no error reported"))); + errmsg ? errmsg : ACE_TEXT ("no error reported"))); #endif /* ACE_NLOGGING */ return 0; @@ -535,14 +535,14 @@ ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name) // name as is done in the ACE macros. Otherwise, leave the function // name as is. - static ACE_TCHAR const make_prefix[] = ACE_LIB_TEXT ("_make_"); + static ACE_TCHAR const make_prefix[] = ACE_TEXT ("_make_"); static size_t const make_prefix_len = sizeof (make_prefix) / sizeof (make_prefix[0]) - 1; if (ACE_OS::strncmp (make_prefix, func_name, make_prefix_len) == 0) { static ACE_TCHAR const versioned_namespace_name[] = - ACE_LIB_TEXT (ACE_VERSIONED_NAMESPACE_NAME_STRING) ACE_LIB_TEXT("_") ; + ACE_TEXT (ACE_VERSIONED_NAMESPACE_NAME_STRING) ACE_TEXT("_") ; // Null terminator included in versioned_namespace_name_len since // it is static constant. @@ -564,7 +564,7 @@ ACE_Function_Node::make_func_name (ACE_TCHAR const * func_name) ACE_OS::snprintf (mangled_func_name, len, - ACE_LIB_TEXT ("%s%s%s"), + ACE_TEXT ("%s%s%s"), make_prefix, versioned_namespace_name, func_name + make_prefix_len); @@ -602,10 +602,10 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, #ifndef ACE_NLOGGING ACE_TCHAR * const errmsg = this->dll_.error (); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("DLL::symbol failed for function %s: ") - ACE_LIB_TEXT ("%s\n"), + ACE_TEXT ("DLL::symbol failed for function %s: ") + ACE_TEXT ("%s\n"), function_name, - errmsg ? errmsg : ACE_LIB_TEXT ("no error reported"))); + errmsg ? errmsg : ACE_TEXT ("no error reported"))); #endif /* ACE_NLOGGING */ return 0; @@ -627,7 +627,7 @@ ACE_Function_Node::symbol (ACE_Service_Gestalt *, { ++yyerrno; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), + ACE_TEXT ("%p\n"), this->function_name_), 0); } @@ -669,7 +669,7 @@ ACE_Dummy_Node::apply (ACE_Service_Gestalt *, int &yyerrno) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("did operations on stream %s, error = %d\n"), + ACE_TEXT ("did operations on stream %s, error = %d\n"), this->name (), yyerrno)); #else @@ -720,8 +720,8 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, { yyerrno++; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) No static service ") - ACE_LIB_TEXT ("registered for function %s\n"), + ACE_TEXT ("(%P|%t) No static service ") + ACE_TEXT ("registered for function %s\n"), this->function_name_), 0); } @@ -735,8 +735,8 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, ++yyerrno; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) No static service factory ") - ACE_LIB_TEXT ("function registered for function %s\n"), + ACE_TEXT ("(%P|%t) No static service factory ") + ACE_TEXT ("function registered for function %s\n"), this->function_name_), 0); } @@ -749,7 +749,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Gestalt *config, { ++yyerrno; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), + ACE_TEXT ("%p\n"), this->function_name_), 0); } @@ -818,8 +818,8 @@ ACE_Service_Type_Factory::make_service_type (ACE_Service_Gestalt *cfg) const #ifndef ACE_NLOGGING ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) Unable to create ") - ACE_LIB_TEXT ("service object for %s\n"), + ACE_TEXT ("ACE (%P|%t) Unable to create ") + ACE_TEXT ("service object for %s\n"), this->name ())); #endif ++yyerrno; diff --git a/ACE/ace/Ping_Socket.cpp b/ACE/ace/Ping_Socket.cpp index cf7655fdf6c..8fc6ffcc69f 100644 --- a/ACE/ace/Ping_Socket.cpp +++ b/ACE/ace/Ping_Socket.cpp @@ -114,8 +114,8 @@ ACE_Ping_Socket::ACE_Ping_Socket (ACE_Addr const & local, if (this->open (local, protocol, reuse_addr) == -1) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"), - ACE_LIB_TEXT ("open"))); + ACE_TEXT ("ACE_Ping_Socket::ACE_Ping_Socket: %p\n"), + ACE_TEXT ("open"))); return; } @@ -231,13 +231,13 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") - ACE_LIB_TEXT (" - ICMP length is %d < 8.\n"), + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") + ACE_TEXT (" - ICMP length is %d < 8.\n"), icmplen)); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ") - ACE_LIB_TEXT ("The ICMP header either not received or is corrupted.")), + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram - ") + ACE_TEXT ("The ICMP header either not received or is corrupted.")), -1); } @@ -245,36 +245,36 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") - ACE_LIB_TEXT (" - ICMP_ECHOREPLY received.\n"))); + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::process_incoming_dgram") + ACE_TEXT (" - ICMP_ECHOREPLY received.\n"))); if (icmp->icmp_id != getpid ()) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::") - ACE_LIB_TEXT ("process_incoming_dgram ") - ACE_LIB_TEXT ("- The ICMP header received is a reply") - ACE_LIB_TEXT (" to request of another process.")), + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::") + ACE_TEXT ("process_incoming_dgram ") + ACE_TEXT ("- The ICMP header received is a reply") + ACE_TEXT (" to request of another process.")), -1); } if (icmplen < 16) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::") - ACE_LIB_TEXT ("process_incoming_dgram - ICMP length ") - ACE_LIB_TEXT ("is %d < 16."), + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::") + ACE_TEXT ("process_incoming_dgram - ICMP length ") + ACE_TEXT ("is %d < 16."), icmplen), -1); } ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") - ACE_LIB_TEXT ("received ") - ACE_LIB_TEXT ("ICMP datagram with length of %d bytes (not counting ") - ACE_LIB_TEXT ("IP-header): seq=%u, ttl=%d.\n"), + ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") + ACE_TEXT ("received ") + ACE_TEXT ("ICMP datagram with length of %d bytes (not counting ") + ACE_TEXT ("IP-header): seq=%u, ttl=%d.\n"), icmplen, icmp->icmp_seq, ip->ip_ttl)); return 0; //= success @@ -282,8 +282,8 @@ ACE_Ping_Socket::process_incoming_dgram (char * ptr, ssize_t len) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") - ACE_LIB_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n"))); + ACE_TEXT ("(%P|%t) ACE::Ping_Socket::process_incoming_dgram - ") + ACE_TEXT ("received datagram that is not ICMP_ECHOREPLY.\n"))); return -1; } @@ -366,7 +366,7 @@ ACE_Ping_Socket::make_echo_check (ACE_INET_Addr & remote_addr, ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d.\n"), + ACE_TEXT ("(%P|%t) ACE_Ping_Socket::make_echo_check - sent %d.\n"), rval_send)); return this->receive_echo_reply (timeout); diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index fa81a52abad..f40299ce79f 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -28,9 +28,9 @@ ACE_Pipe::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Pipe::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("handles_[0] = %d"), this->handles_[0])); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("handles_[0] = %d"), this->handles_[0])); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhandles_[1] = %d"), this->handles_[1])); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -124,8 +124,8 @@ ACE_Pipe::open (int buffer_size) ACE_UNUSED_ARG (buffer_size); if (ACE_OS::pipe (this->handles_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("pipe")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("pipe")), -1); #if !defined(__QNX__) @@ -142,8 +142,8 @@ ACE_Pipe::open (int buffer_size) { this->close (); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ioctl")), -1); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ioctl")), -1); } #endif /* __QNX__ */ @@ -153,8 +153,8 @@ ACE_Pipe::open (int buffer_size) 0, this->handles_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("socketpair")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("socketpair")), -1); # if defined (ACE_LACKS_SOCKET_BUFSIZ) ACE_UNUSED_ARG (buffer_size); @@ -218,7 +218,7 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2]) if (this->open (handles) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Pipe::ACE_Pipe"))); + ACE_TEXT ("ACE_Pipe::ACE_Pipe"))); } ACE_Pipe::ACE_Pipe (ACE_HANDLE read, diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 9d529243604..5eef3596e59 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -160,8 +160,8 @@ ACE_Proactor_Timer_Handler::svc (void) default: // Error. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")), + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")), -1); } } @@ -215,8 +215,8 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &, { if (this->proactor_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") - ACE_LIB_TEXT (" no completion port to post timeout to?!@\n")), + ACE_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,") + ACE_TEXT (" no completion port to post timeout to?!@\n")), -1); // Create the Asynch_Timer. @@ -230,9 +230,9 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &, if (asynch_timer == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") - ACE_LIB_TEXT ("create_asynch_timer failed")), + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall::timeout:") + ACE_TEXT ("create_asynch_timer failed")), -1); auto_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer); @@ -241,8 +241,8 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &, if (-1 == safe_asynch_timer->post_completion (this->proactor_->implementation ())) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Failure in dealing with timers: ") - ACE_LIB_TEXT ("PostQueuedCompletionStatus failed\n")), + ACE_TEXT ("Failure in dealing with timers: ") + ACE_TEXT ("PostQueuedCompletionStatus failed\n")), -1); // The completion has been posted. The proactor is now responsible @@ -291,8 +291,8 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor) } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose") - ACE_LIB_TEXT (" to be used with ONE (and only one) Proactor\n")), + ACE_TEXT ("ACE_Proactor_Handle_Timeout_Upcall is only suppose") + ACE_TEXT (" to be used with ONE (and only one) Proactor\n")), -1); } @@ -349,8 +349,8 @@ ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation, // Activate <timer_handler>. if (this->timer_handler_->activate (THR_NEW_LWP) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT ("Task::activate:could not create thread\n"))); + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("Task::activate:could not create thread\n"))); } ACE_Proactor::~ACE_Proactor (void) @@ -420,13 +420,13 @@ ACE_Proactor::close_singleton (void) const ACE_TCHAR * ACE_Proactor::dll_name (void) { - return ACE_LIB_TEXT ("ACE"); + return ACE_TEXT ("ACE"); } const ACE_TCHAR * ACE_Proactor::name (void) { - return ACE_LIB_TEXT ("ACE_Proactor"); + return ACE_TEXT ("ACE_Proactor"); } int @@ -605,8 +605,8 @@ ACE_Proactor::close (void) // Close the implementation. if (this->implementation ()->close () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), + ACE_TEXT ("%N:%l:(%P | %t):%p\n"), + ACE_TEXT ("ACE_Proactor::close:implementation couldnt be closed")), -1); // Delete the implementation. diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index a66b852e0ab..276030bec96 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -116,16 +116,16 @@ ACE_Process::spawn (ACE_Process_Options &options) #if defined (ACE_WIN32) # if defined (ACE_WIN64) curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len], - ACE_LIB_TEXT (" +H %I64p"), + ACE_TEXT (" +H %I64p"), h); # else curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len], - ACE_LIB_TEXT (" +H %p"), + ACE_TEXT (" +H %p"), h); # endif /* ACE_WIN64 */ #else curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len], - ACE_LIB_TEXT (" +H %d"), + ACE_TEXT (" +H %d"), h); #endif /* ACE_WIN32 */ } @@ -354,8 +354,8 @@ ACE_Process::spawn (ACE_Process_Options &options) && ACE_OS::setpgid (0, options.getgroup ()) < 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p.\n"), - ACE_LIB_TEXT ("ACE_Process::spawn: setpgid failed."))); + ACE_TEXT ("%p.\n"), + ACE_TEXT ("ACE_Process::spawn: setpgid failed."))); # endif /* ACE_LACKS_SETPGID */ # if !defined (ACE_LACKS_SETREGID) @@ -364,8 +364,8 @@ ACE_Process::spawn (ACE_Process_Options &options) if (ACE_OS::setregid (options.getrgid (), options.getegid ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p.\n"), - ACE_LIB_TEXT ("ACE_Process::spawn: setregid failed."))); + ACE_TEXT ("%p.\n"), + ACE_TEXT ("ACE_Process::spawn: setregid failed."))); # endif /* ACE_LACKS_SETREGID */ # if !defined (ACE_LACKS_SETREUID) @@ -375,8 +375,8 @@ ACE_Process::spawn (ACE_Process_Options &options) if (ACE_OS::setreuid (options.getruid (), options.geteuid ()) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p.\n"), - ACE_LIB_TEXT ("ACE_Process::spawn: setreuid failed."))); + ACE_TEXT ("%p.\n"), + ACE_TEXT ("ACE_Process::spawn: setreuid failed."))); # endif /* ACE_LACKS_SETREUID */ this->child (ACE_OS::getppid ()); @@ -774,8 +774,8 @@ ACE_Process_Options::inherit_environment (void) if (this->setenv_i (existing_environment + slot, len) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p.\n"), - ACE_LIB_TEXT ("ACE_Process_Options::ACE_Process_Options"))); + ACE_TEXT ("%p.\n"), + ACE_TEXT ("ACE_Process_Options::ACE_Process_Options"))); break; } @@ -858,7 +858,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, // Add in the variable name. ACE_OS::sprintf (safe_newformat.get (), - ACE_LIB_TEXT ("%s=%s"), + ACE_TEXT ("%s=%s"), variable_name, format); @@ -867,7 +867,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, va_start (argp, format); // Add the rest of the varargs. - size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen + size_t tmp_buflen = DEFAULT_COMMAND_LINE_BUF_LEN > buflen ? static_cast<size_t> (DEFAULT_COMMAND_LINE_BUF_LEN) : buflen; int retval = 0; @@ -875,7 +875,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, ACE_NEW_RETURN (stack_buf, ACE_TCHAR[tmp_buflen], -1); ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_stack_buf (stack_buf); - do + do { retval = ACE_OS::vsnprintf (safe_stack_buf.get (), tmp_buflen, safe_newformat.get (), argp); if (retval > ACE_Utils::truncate_cast<int> (tmp_buflen)) @@ -895,7 +895,7 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name, // e.g., LynxOS and VxWorks 5, we have to // fall back to vsprintf. if (errno == ENOTSUP) - { + { // ALERT: Since we have to use vsprintf here, there is still a chance that // the stack_buf overflows, i.e., the length of the resulting string // can still possibly go beyond the allocated stack_buf. @@ -1053,7 +1053,7 @@ ACE_Process_Options::command_line (const ACE_TCHAR *const argv[]) while (argv[++i]) { ACE_OS::strcat (command_line_buf_, - ACE_LIB_TEXT (" ")); + ACE_TEXT (" ")); ACE_OS::strcat (command_line_buf_, argv[i]); } diff --git a/ACE/ace/Process_Manager.cpp b/ACE/ace/Process_Manager.cpp index bf537fd6f1e..5bff4198d4a 100644 --- a/ACE/ace/Process_Manager.cpp +++ b/ACE/ace/Process_Manager.cpp @@ -73,7 +73,7 @@ ACE_Process_Manager::Process_Descriptor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nproc_id_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nproc_id_ = %d"), this->process_->getpid( ))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -88,8 +88,8 @@ ACE_Process_Manager::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_process_table_size_ = %d"), this->max_process_table_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->current_count_)); for (size_t i = 0; i < this->current_count_; i++) this->process_table_[i].dump (); @@ -259,8 +259,8 @@ ACE_Process_Manager::ACE_Process_Manager (size_t size, if (this->open (size, r) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Process_Manager"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Process_Manager"))); } // Close up and release all resources. @@ -369,15 +369,15 @@ ACE_Process_Manager::handle_signal (int, } else ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Process still active") - ACE_LIB_TEXT (" -- shouldn't have been called yet!\n")), + ACE_TEXT ("Process still active") + ACE_TEXT (" -- shouldn't have been called yet!\n")), 0); // return 0 : stay registered } else { // <GetExitCodeProcess> failed. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("GetExitCodeProcess failed")), + ACE_TEXT ("GetExitCodeProcess failed")), -1); // return -1: unregister } #else /* !ACE_WIN32 */ @@ -859,8 +859,8 @@ ACE_Process_Manager::wait (pid_t pid, // we're holding a lock! delete [] handles; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Process removed") - ACE_LIB_TEXT (" -- somebody's ignoring the lock!\n")), + ACE_TEXT ("Process removed") + ACE_TEXT (" -- somebody's ignoring the lock!\n")), -1); } } @@ -948,7 +948,7 @@ ACE_Process_Manager::wait (pid_t pid, { // oops, reaped an unmanaged process! ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), + ACE_TEXT ("(%P|%t) oops, reaped unmanaged %d\n"), pid)); return pid; } @@ -1012,8 +1012,8 @@ ACE_Process_Manager::notify_proc_handler (size_t i, else { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:") - ACE_LIB_TEXT (" unknown/unmanaged process reaped\n"))); + ACE_TEXT ("(%P:%t|%T) ACE_Process_Manager::notify_proc_handler:") + ACE_TEXT (" unknown/unmanaged process reaped\n"))); return 0; } } diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 93e41a30a70..03d1d1c46ce 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -45,7 +45,7 @@ ACE_Profile_Timer::ACE_Profile_Timer (void) this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0); if (this->proc_handle_ == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), + ACE_TEXT ("%p\n"), buf)); # elif defined (ACE_HAS_GETRUSAGE) ACE_OS::memset (&this->begin_time_, 0, sizeof this->begin_time_); @@ -61,7 +61,7 @@ ACE_Profile_Timer::~ACE_Profile_Timer (void) # if defined (ACE_HAS_PRUSAGE_T) if (ACE_OS::close (this->proc_handle_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer"))); + ACE_TEXT ("ACE_Profile_Timer::~ACE_Profile_Timer"))); # endif /* ACE_HAS_PRUSAGE_T */ } diff --git a/ACE/ace/QoS/QoS_Manager.cpp b/ACE/ace/QoS/QoS_Manager.cpp index 27fa39ab560..5dcd5d7a473 100644 --- a/ACE/ace/QoS/QoS_Manager.cpp +++ b/ACE/ace/QoS/QoS_Manager.cpp @@ -24,8 +24,8 @@ ACE_QoS_Manager::join_qos_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set ().insert (qos_session) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in adding a new session to the ") - ACE_LIB_TEXT ("socket session set\n")), + ACE_TEXT ("Error in adding a new session to the ") + ACE_TEXT ("socket session set\n")), -1); return 0; } diff --git a/ACE/ace/QoS/QoS_Session_Factory.cpp b/ACE/ace/QoS/QoS_Session_Factory.cpp index 89a8fbcc913..18f0957696a 100644 --- a/ACE/ace/QoS/QoS_Session_Factory.cpp +++ b/ACE/ace/QoS/QoS_Session_Factory.cpp @@ -19,7 +19,7 @@ const enum ACE_QoS_Session_Factory::ACE_QoS_Session_Type ACE_QoS_Session_Factory::ACE_DEFAULT_QOS_SESSION = ACE_QoS_Session_Factory::ACE_GQOS_SESSION; #else # error "QoS type not supported. Cannot build." -#endif /* ACE_HAS_RAPI */ +#endif /* ACE_HAS_RAPI */ ACE_QoS_Session_Factory::ACE_QoS_Session_Factory (void) { @@ -54,7 +54,7 @@ ACE_QoS_Session_Factory::create_session (ACE_QoS_Session_Type qos_session_type) { delete qos_session; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in adding session\n")), + ACE_TEXT ("Error in adding session\n")), 0); } @@ -68,7 +68,7 @@ ACE_QoS_Session_Factory::destroy_session (ACE_QoS_Session *qos_session) if ((qos_session != 0) && (this->remove_session (qos_session) == -1)) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in destroying session\n")), + ACE_TEXT ("Error in destroying session\n")), -1); return 0; @@ -81,8 +81,8 @@ ACE_QoS_Session_Factory::add_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.insert (qos_session) != 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in adding a new session") - ACE_LIB_TEXT ("to the session set\n")), + ACE_TEXT ("Error in adding a new session") + ACE_TEXT ("to the session set\n")), -1); return 0; @@ -95,8 +95,8 @@ ACE_QoS_Session_Factory::remove_session (ACE_QoS_Session *qos_session) { if (this->qos_session_set_.remove (qos_session) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in removing a session") - ACE_LIB_TEXT ("from the session set\n")), + ACE_TEXT ("Error in removing a session") + ACE_TEXT ("from the session set\n")), -1); return 0; diff --git a/ACE/ace/QoS/QoS_Session_Impl.cpp b/ACE/ace/QoS/QoS_Session_Impl.cpp index 4e8de02a8ab..4f313d1f069 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.cpp +++ b/ACE/ace/QoS/QoS_Session_Impl.cpp @@ -53,7 +53,7 @@ rsvp_callback (rapi_sid_t /* sid */, ACE_QoS_Session *qos_session = (ACE_QoS_Session *) args; qos_flowspecx_t *csxp = 0; - + if (!flow_spec_list) { ACE_DEBUG ((LM_DEBUG, @@ -70,7 +70,7 @@ rsvp_callback (rapi_sid_t /* sid */, -1); } } - + ACE_QoS ace_qos = qos_session->qos (); switch(eventype) @@ -83,7 +83,7 @@ rsvp_callback (rapi_sid_t /* sid */, flow_spec_no, &flow_spec_list->len)); ACE_Flow_Spec *receiving_fs = 0; - + if (flow_spec_no != 0) { @@ -103,8 +103,8 @@ rsvp_callback (rapi_sid_t /* sid */, 25, 0), -1); - - + + ACE_DEBUG ((LM_DEBUG, "\nTSpec :\n" "\t Spec Type = %d\n" @@ -121,32 +121,32 @@ rsvp_callback (rapi_sid_t /* sid */, csxp->xspec_m, csxp->xspec_M, 25)); - - } + + } // Set the sending flowspec QoS of the given session. ace_qos.receiving_flowspec (receiving_fs); qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_PATH_EVENT); } - + break; case RAPI_RESV_EVENT: - { + { ACE_DEBUG ((LM_DEBUG, "RSVP RESV Event received\n" "No. of FlowSpecs received : %d\n", flow_spec_no)); - + ACE_Flow_Spec *sending_flow = 0; - + if (flow_spec_no != 0) { ACE_NEW_RETURN (sending_flow, ACE_Flow_Spec, -1); - + // Choose based on the service type : [QOS_GUARANTEEDX/QOS_CNTR_LOAD]. switch (csxp->spec_type) { @@ -181,11 +181,11 @@ rsvp_callback (rapi_sid_t /* sid */, }; } ace_qos.sending_flowspec (sending_flow); - + qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_EVENT); } break; - + case RAPI_PATH_ERROR: { ACE_DEBUG ((LM_DEBUG, @@ -209,7 +209,7 @@ rsvp_callback (rapi_sid_t /* sid */, qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_ERROR); } break; - + case RAPI_RESV_CONFIRM: { ACE_DEBUG ((LM_DEBUG, @@ -217,7 +217,7 @@ rsvp_callback (rapi_sid_t /* sid */, qos_session->rsvp_event_type (ACE_QoS_Session::RSVP_RESV_CONFIRM); } break; - + default: ACE_DEBUG ((LM_DEBUG, "Unknown RSVP Event Received\n")); @@ -238,7 +238,7 @@ ACE_RAPI_Session::ACE_RAPI_Session (void) ACE_TRACE ("ACE_RAPI_Session::ACE_RAPI_Session"); //this->source_port (DEFAULT_SOURCE_SENDER_PORT); ACE_NEW (this->src_addr_, - ACE_INET_Addr ("0")); + ACE_INET_Addr ("0")); } // Open a RAPI QoS session [dest IP, dest port, Protocol ID]. @@ -334,7 +334,7 @@ int ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) { ACE_Flow_Spec *sending_flowspec = ace_qos.sending_flowspec (); - + if (sending_flowspec == 0) { int result = rapi_sender (this->session_id_, @@ -353,7 +353,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) else ACE_DEBUG ((LM_DEBUG, "rapi_sender () call succeeds with PATH Tear! \n")); - + return 0; } @@ -391,7 +391,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) t_spec->tspecbody_qosx.xtspec_m, t_spec->tspecbody_qosx.xtspec_M, sending_flowspec->ttl ())); - + // This the source sender port. // ACE_INET_Addr sender_addr (this->source_port ()); @@ -409,7 +409,7 @@ ACE_RAPI_Session::sending_qos (const ACE_QoS &ace_qos) 0, 0, sending_flowspec->ttl ()) ; - + /* int result = rapi_sender(this->session_id_, 0, @@ -463,10 +463,10 @@ ACE_RAPI_Session::receiving_qos (const ACE_QoS &ace_qos) else ACE_DEBUG ((LM_DEBUG, "rapi_reserve () for RESV Tear call succeeds \n")); - + return 0; } - + rapi_flowspec_t *flow_spec = init_flowspec_simplified (*receiving_flowspec); @@ -675,8 +675,8 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, if (qos_manager->qos_session_set ().find (this) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("This QoS session was not subscribed to") - ACE_LIB_TEXT (" by the socket\n")), + ACE_TEXT ("This QoS session was not subscribed to") + ACE_TEXT (" by the socket\n")), -1); // Set the QOS according to the supplied ACE_QoS. The I/O control @@ -690,12 +690,12 @@ ACE_GQoS_Session::qos (ACE_SOCK *socket, qos, &ret_bytes) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"), + ACE_TEXT ("Error in Qos set ACE_OS::ioctl() %d\n"), ret_bytes), -1); else ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds \n"))); + ACE_TEXT ("Setting QoS with ACE_OS::ioctl () succeeds \n"))); return 0; } diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp index 2aa5ba852e1..1788a98ea82 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp @@ -115,7 +115,7 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe_ifs (const ACE_INET_Addr &mcast_addr, if (this->subscribe (mcast_addr, qos_params, reuse_addr, - ACE_LIB_TEXT ("0.0.0.0"), + ACE_TEXT ("0.0.0.0"), protocol_family, protocol, protocolinfo) == 0) @@ -221,18 +221,18 @@ ACE_SOCK_Dgram_Mcast_QoS::subscribe (const ACE_INET_Addr &mcast_addr, // Subscribe to the QoS session. if (this->qos_manager_.join_qos_session (qos_session) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Unable to join QoS Session\n")), + ACE_TEXT ("Unable to join QoS Session\n")), -1); } else { if (this->close () != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Unable to close socket\n"))); + ACE_TEXT ("Unable to close socket\n"))); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Dest Addr in the QoS Session does") - ACE_LIB_TEXT (" not match the address passed into") - ACE_LIB_TEXT (" subscribe\n")), + ACE_TEXT ("Dest Addr in the QoS Session does") + ACE_TEXT (" not match the address passed into") + ACE_TEXT (" subscribe\n")), -1); } diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp index a60190300a8..91cefa0f037 100644 --- a/ACE/ace/RB_Tree.cpp +++ b/ACE/ace/RB_Tree.cpp @@ -54,7 +54,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator allocator_ = alloc; if (this->open (alloc) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); + ACE_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n"))); } // Copy constructor. @@ -150,14 +150,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre if (!x) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nerror: x is a null pointer in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); else if (! (x->left())) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x->left () is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nerror: x->left () is a null pointer in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n"))); else { ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; @@ -189,14 +189,14 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree if (! x) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x is a null pointer in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nerror: x is a null pointer in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); else if (! (x->right())) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: x->right () is a null pointer ") - ACE_LIB_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nerror: x->right () is a null pointer ") + ACE_TEXT ("in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n"))); else { ACE_RB_Tree_Node<EXT_ID, INT_ID> * y; @@ -399,9 +399,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N { // If we got here, something is drastically wrong! ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nerror: parent's parent is null in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nerror: parent's parent is null in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n"))); return; } @@ -633,9 +633,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { // If there is already a right subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nright subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nright subtree already present in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); } else @@ -669,9 +669,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->left ()) // If there is already a left subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nleft subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nleft subtree already present in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0); else { @@ -710,7 +710,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, this->root_->color (ACE_RB_Tree_Node_Base::BLACK); ++current_size_; return &this->root_->item (); - } + } } // Inserts a *copy* of the key and the item into the tree: both the @@ -750,9 +750,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, { // If there is already a right subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nright subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nright subtree already present in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); } else @@ -785,9 +785,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, if (current->left ()) // If there is already a left subtree, complain. ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nleft subtree already present in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nleft subtree already present in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1); else { @@ -866,17 +866,17 @@ dump_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *node) const { dump_node_i (*node); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ndown left\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown left\n"))); this->dump_i (node->left ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nup left\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup left\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ndown right\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ndown right\n"))); this->dump_i (node->right ()); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nup right\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nup right\n"))); } else { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nNULL POINTER (BLACK)\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nNULL POINTER (BLACK)\n"))); } #else /* !ACE_HAS_DUMP */ ACE_UNUSED_ARG (node); @@ -895,7 +895,7 @@ dump_node_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> &node) const const char * color_str = (node.color () == ACE_RB_Tree_Node_Base::RED) ? "RED" : "BLACK"; - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" color=[%s]\n"), color_str)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" color=[%s]\n"), color_str)); #else /* !ACE_HAS_DUMP */ ACE_UNUSED_ARG (node); #endif /* ACE_HAS_DUMP */ @@ -917,7 +917,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant (void) int expected_black_height = -1; if (this->test_invariant_recurse (this->root_, expected_black_height, 0) == 0) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("invariant holds\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("invariant holds\n"))); return 0; } @@ -945,9 +945,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE else if (expected_black_height != measured_black_height) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("\nexpected_black_height = %d but ") - ACE_LIB_TEXT ("\nmeasured_black_height = %d in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n"), + ACE_TEXT ("\nexpected_black_height = %d but ") + ACE_TEXT ("\nmeasured_black_height = %d in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n"), expected_black_height, measured_black_height), -1); } @@ -961,18 +961,18 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::test_invariant_recurse (ACE if (x->left () && x->left ()->color () == ACE_RB_Tree_Node_Base::RED) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nRED parent has RED left child in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nRED parent has RED left child in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), -1); } if (x->right () && x->right ()->color () == ACE_RB_Tree_Node_Base::RED) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("\nRED parent has RED right child in ") - ACE_LIB_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("\nRED parent has RED right child in ") + ACE_TEXT ("ACE_RB_Tree<EXT_ID, INT_ID>::test_invariant_recurse\n")), -1); } } @@ -1126,7 +1126,7 @@ ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnode_ = %x\n"), this->node_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnode_ = %x\n"), this->node_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl index 2e9b266ee92..7cbac0c9f7a 100644 --- a/ACE/ace/RB_Tree.inl +++ b/ACE/ace/RB_Tree.inl @@ -577,10 +577,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_size_ = %d\n"), this->current_size_)); this->allocator_->dump (); this->lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nDumping nodes from root\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nDumping nodes from root\n"))); this->dump_i (this->root_); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/RW_Mutex.cpp b/ACE/ace/RW_Mutex.cpp index 54a9b17047d..bfeac13c30b 100644 --- a/ACE/ace/RW_Mutex.cpp +++ b/ACE/ace/RW_Mutex.cpp @@ -29,7 +29,7 @@ ACE_RW_Mutex::dump (void) const // ACE_TRACE ("ACE_RW_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -40,8 +40,8 @@ ACE_RW_Mutex::ACE_RW_Mutex (int type, const ACE_TCHAR *name, void *arg) // ACE_TRACE ("ACE_RW_Mutex::ACE_RW_Mutex"); if (ACE_OS::rwlock_init (&this->lock_, type, name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_RW_Mutex::ACE_RW_Mutex"))); } ACE_RW_Mutex::~ACE_RW_Mutex (void) diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp index c71089fb62f..ed2dd8f2886 100644 --- a/ACE/ace/Reactor.cpp +++ b/ACE/ace/Reactor.cpp @@ -198,13 +198,13 @@ ACE_Reactor::close_singleton (void) const ACE_TCHAR * ACE_Reactor::dll_name (void) { - return ACE_LIB_TEXT ("ACE"); + return ACE_TEXT ("ACE"); } const ACE_TCHAR * ACE_Reactor::name (void) { - return ACE_LIB_TEXT ("ACE_Reactor"); + return ACE_TEXT ("ACE_Reactor"); } int diff --git a/ACE/ace/Reactor_Token_T.cpp b/ACE/ace/Reactor_Token_T.cpp index 358b0b14f65..73ab406db63 100644 --- a/ACE/ace/Reactor_Token_T.cpp +++ b/ACE/ace/Reactor_Token_T.cpp @@ -12,7 +12,7 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::dump (void) const ACE_TRACE ("ACE_Reactor_Token_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -63,8 +63,8 @@ ACE_Reactor_Token_T<ACE_TOKEN_TYPE>::sleep_hook (void) ACE_TRACE ("ACE_Reactor_Token_T::sleep_hook"); if (this->reactor_->notify () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("sleep_hook failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("sleep_hook failed"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Read_Buffer.cpp b/ACE/ace/Read_Buffer.cpp index c2912fd50c1..ec5c8b94ef1 100644 --- a/ACE/ace/Read_Buffer.cpp +++ b/ACE/ace/Read_Buffer.cpp @@ -24,10 +24,10 @@ ACE_Read_Buffer::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Read_Buffer::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("size_ = %d"), this->size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\noccurrences_ = %d"), this->occurrences_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nstream_ = %x"), this->stream_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nallocator_ = %x"), this->allocator_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("size_ = %d"), this->size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\noccurrences_ = %d"), this->occurrences_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nstream_ = %x"), this->stream_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nallocator_ = %x"), this->allocator_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -48,7 +48,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp, ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle, bool close_on_delete, ACE_Allocator *alloc) - : stream_ (ACE_OS::fdopen (handle, ACE_LIB_TEXT ("r"))), + : stream_ (ACE_OS::fdopen (handle, ACE_TEXT ("r"))), close_on_delete_ (close_on_delete), allocator_ (alloc) { diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index daf28c8a9ab..673b77ca2ed 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -33,8 +33,8 @@ ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name, name, arg) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("recursive_mutex_init"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("recursive_mutex_init"))); } ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex (void) @@ -91,7 +91,7 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void) // accessed directly. It is documented to change at any time. // // It has been reported that this this works for all three - // architectures. However, this does not work on Win64 before SP1. + // architectures. However, this does not work on Win64 before SP1. return this->lock_.RecursionCount; # else ACE_NOTSUP_RETURN (-1); diff --git a/ACE/ace/Registry.cpp b/ACE/ace/Registry.cpp index b6907ebec18..3b638e49b25 100644 --- a/ACE/ace/Registry.cpp +++ b/ACE/ace/Registry.cpp @@ -27,7 +27,7 @@ ACE_RCSID (ace, ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_TCHAR const ACE_Registry::STRING_SEPARATOR[] = ACE_LIB_TEXT ("\\"); +ACE_TCHAR const ACE_Registry::STRING_SEPARATOR[] = ACE_TEXT ("\\"); bool ACE_Registry::Name_Component::operator== (const Name_Component &rhs) const @@ -1085,7 +1085,7 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co #else long result = -1; - if (machine_name != 0 && ACE_OS::strcmp (ACE_LIB_TEXT ("localhost"), machine_name) == 0) + if (machine_name != 0 && ACE_OS::strcmp (ACE_TEXT ("localhost"), machine_name) == 0) machine_name = 0; if (predefined == HKEY_LOCAL_MACHINE || predefined == HKEY_USERS) diff --git a/ACE/ace/Registry_Name_Space.cpp b/ACE/ace/Registry_Name_Space.cpp index c5c5989b789..c2dd3618887 100644 --- a/ACE/ace/Registry_Name_Space.cpp +++ b/ACE/ace/Registry_Name_Space.cpp @@ -16,8 +16,8 @@ ACE_Registry_Name_Space::ACE_Registry_Name_Space (void) ACE_Registry_Name_Space::ACE_Registry_Name_Space (ACE_Name_Options *name_options) { if (this->open (name_options) != 0) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Registry_Name_Space::open"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Registry_Name_Space::open"))); } @@ -36,8 +36,8 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) HKEY_LOCAL_MACHINE, host); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Predefined_Naming_Context::connect")), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Predefined_Naming_Context::connect")), result); else { @@ -52,7 +52,7 @@ ACE_Registry_Name_Space::open (ACE_Name_Options *name_options) result = predefined.bind_context (name, this->context_); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::bind_context")), result); } return 0; } @@ -254,7 +254,7 @@ ACE_Registry_Name_Space::list_name_entries (ACE_BINDING_SET &set, value, type); if (result != 0) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Registry::Naming_Context::resolve")), result); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Registry::Naming_Context::resolve")), result); // Complete binding ACE_Name_Binding binding (key, value, type); diff --git a/ACE/ace/Remote_Name_Space.cpp b/ACE/ace/Remote_Name_Space.cpp index 2b55cf684a5..43fb8db9b19 100644 --- a/ACE/ace/Remote_Name_Space.cpp +++ b/ACE/ace/Remote_Name_Space.cpp @@ -37,7 +37,7 @@ ACE_Remote_Name_Space::ACE_Remote_Name_Space (const ACE_TCHAR *hostname, { ACE_TRACE ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"); if (this->open (hostname, port) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_Remote_Name_Space::ACE_Remote_Name_Space"))); } int @@ -154,8 +154,8 @@ ACE_Remote_Name_Space::list_names (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_names")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -188,8 +188,8 @@ ACE_Remote_Name_Space::list_values (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -224,8 +224,8 @@ ACE_Remote_Name_Space::list_types (ACE_WSTRING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -259,8 +259,8 @@ ACE_Remote_Name_Space::list_name_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_names")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_names")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -300,8 +300,8 @@ ACE_Remote_Name_Space::list_value_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { @@ -341,8 +341,8 @@ ACE_Remote_Name_Space::list_type_entries (ACE_BINDING_SET &set, { if (this->ns_proxy_.recv_reply (reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Remote_Name_Space::list_values")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Remote_Name_Space::list_values")), -1); if (reply.msg_type () != ACE_Name_Request::MAX_ENUM) { diff --git a/ACE/ace/Remote_Tokens.cpp b/ACE/ace/Remote_Tokens.cpp index 1725993ae4c..ce60205a77a 100644 --- a/ACE/ace/Remote_Tokens.cpp +++ b/ACE/ace/Remote_Tokens.cpp @@ -75,7 +75,7 @@ ACE_TSS_Connection::make_TSS_TYPE (void) const return 0; } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection new connection\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection new connection\n"))); return stream; } @@ -90,10 +90,10 @@ ACE_TSS_Connection::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_TSS_Connection::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_TSS_Connection::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("server_address_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_TSS_Connection::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("server_address_\n"))); server_address_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_TSS<ACE_SOCK_Stream>::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -134,7 +134,7 @@ ACE_Remote_Token_Proxy::initiate_connection (void) { errno = ENOENT; ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); + ACE_TEXT ("ACE_Remote_Token_Proxy not open.\n")), -1); } ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -152,7 +152,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, ssize_t length; if ((length = request.encode (buffer)) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("encode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("encode failed")), -1); ACE_SOCK_Stream *peer = ACE_Token_Connections::instance ()->get_connection (); @@ -162,7 +162,7 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Transmit request via a blocking send. if (peer->send_n (buffer, length) != length) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("send_n failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("send_n failed")), -1); else { ACE_Token_Reply reply; @@ -170,10 +170,10 @@ ACE_Remote_Token_Proxy::request_reply (ACE_Token_Request &request, // Receive reply via blocking read. if (peer->recv (&reply, sizeof reply) != sizeof reply) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("recv failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("recv failed")), -1); if (reply.decode () == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("decode failed")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); if (errno != 0) @@ -201,14 +201,14 @@ ACE_Remote_Token_Proxy::acquire (int notify, case EWOULDBLOCK : // Whoah, we detected wouldblock via the shadow mutex! if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: acquire will block, owner is %s\n"), this->token_->owner_id ())); // No error, but would block, break; case EDEADLK : if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) shadow: deadlock detected\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) shadow: deadlock detected\n"))); if (ignore_shadow_deadlock_) break; @@ -220,8 +220,8 @@ ACE_Remote_Token_Proxy::acquire (int notify, default : ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%t) %p shadow acquire failed\n"), - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), + ACE_TEXT ("(%t) %p shadow acquire failed\n"), + ACE_TEXT ("ACE_Remote_Token_Proxy")), -1); } } @@ -240,12 +240,12 @@ ACE_Remote_Token_Proxy::acquire (int notify, if (result == -1) { // Update the local shadow copy. - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("error on remote acquire, releasing shadow mutex.\n"))); ACE_Token_Proxy::release (); } else { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) acquired %s remotely.\n"), this->name ())); // Our shadow call may have failed. However, it's still a race // to the remote server. If we beat the client which holds the // local token, we need to fix things locally to reflect the @@ -271,7 +271,7 @@ ACE_Remote_Token_Proxy::tryacquire (void (*sleep_hook)(void *)) // Save/restore errno. ACE_Errno_Guard error (errno); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("shadow try acquire failed\n"))); + ACE_TEXT ("shadow try acquire failed\n"))); } return -1; @@ -302,7 +302,7 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, return -1; else if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%t) shadow: renew would block. owner %s.\n"), + ACE_TEXT ("(%t) shadow: renew would block. owner %s.\n"), this->token_->owner_id ())); } @@ -325,13 +325,13 @@ ACE_Remote_Token_Proxy::renew (int requeue_position, ACE_Token_Proxy::release (); } ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), - ACE_LIB_TEXT ("ACE_Remote_Token_Proxy")), -1); + ACE_TEXT ("%p error on remote renew, releasing shadow mutex.\n"), + ACE_TEXT ("ACE_Remote_Token_Proxy")), -1); } else { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) renewed %s remotely.\n"), this->name ())); // Make sure that the local shadow reflects our new ownership. token_->make_owner (waiter_); return result; @@ -352,13 +352,13 @@ ACE_Remote_Token_Proxy::release (ACE_Synch_Options &options) int result = this->request_reply (request, options); if (result == 0) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) released %s remotely.\n"), this->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) released %s remotely.\n"), this->name ())); // whether success or failure, we're going to release the shadow. // If race conditions exist such that we are no longer the owner, // this release will perform a remove. if (ACE_Token_Proxy::release () == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("(%t) shadow: release failed\n"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) shadow: release failed\n"))); return result; } @@ -374,7 +374,7 @@ void ACE_Remote_Token_Proxy::token_acquired (ACE_TPQ_Entry *) { ACE_TRACE ("ACE_Remote_Token_Proxy::token_acquired"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) %s shadow token %s acquired\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) %s shadow token %s acquired\n"), this->client_id (), this->name ())); // ACE_Token_Proxy::token_acquired (vp); @@ -384,7 +384,7 @@ const ACE_TCHAR* ACE_Remote_Token_Proxy::owner_id (void) { ACE_TRACE ("ACE_Remote_Token_Proxy::owner_id"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_id called\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_id called\n"))); // @@ special operation return 0; } @@ -395,10 +395,10 @@ ACE_Remote_Token_Proxy::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Token_Proxy::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Tokens::dump:\n") - ACE_LIB_TEXT (" ignore_shadow_deadlock_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Tokens::dump:\n") + ACE_TEXT (" ignore_shadow_deadlock_ = %d\n"), ignore_shadow_deadlock_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -432,8 +432,8 @@ ACE_Remote_Mutex::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_Mutex::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_Mutex::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -473,8 +473,8 @@ ACE_Remote_RLock::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_RLock::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_RLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_RLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -515,8 +515,8 @@ ACE_Remote_WLock::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Remote_WLock::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Remote_WLock::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Remote_WLock::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Remote_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/SOCK.cpp b/ACE/ace/SOCK.cpp index f6618cdada4..fdeb4569d50 100644 --- a/ACE/ace/SOCK.cpp +++ b/ACE/ace/SOCK.cpp @@ -123,8 +123,8 @@ ACE_SOCK::ACE_SOCK (int type, protocol, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); } int @@ -178,8 +178,8 @@ ACE_SOCK::ACE_SOCK (int type, flags, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK::ACE_SOCK"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK::ACE_SOCK"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index ba7d435850a..70cc5bcf449 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -341,8 +341,8 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Acceptor"))); } // General purpose routine for performing server ACE_SOCK creation. @@ -393,8 +393,8 @@ ACE_SOCK_Acceptor::ACE_SOCK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Acceptor"))); } int diff --git a/ACE/ace/SOCK_CODgram.cpp b/ACE/ace/SOCK_CODgram.cpp index 8bacd9d1220..eb1d3f18291 100644 --- a/ACE/ace/SOCK_CODgram.cpp +++ b/ACE/ace/SOCK_CODgram.cpp @@ -31,7 +31,7 @@ ACE_SOCK_CODgram::ACE_SOCK_CODgram (const ACE_Addr &remote, const ACE_Addr &loca ACE_TRACE ("ACE_SOCK_CODgram::ACE_SOCK_CODgram"); if (this->open (remote, local, protocol_family, protocol, reuse_addr) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SOCK_CODgram"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SOCK_CODgram"))); } /* This is the general-purpose open routine. Note that it performs diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index 7a0f5b9ec95..2dda434d258 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -320,8 +320,8 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } #if !defined (ACE_HAS_WINCE) @@ -351,8 +351,8 @@ ACE_SOCK_Connector::ACE_SOCK_Connector (ACE_SOCK_Stream &new_stream, && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Connector::ACE_SOCK_Connector"))); } #endif // ACE_HAS_WINCE diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 6ed05164a3e..22835661fee 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -234,8 +234,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, protocol, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Dgram"))); } ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, @@ -255,8 +255,8 @@ ACE_SOCK_Dgram::ACE_SOCK_Dgram (const ACE_Addr &local, flags, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Dgram"))); } #if defined (ACE_HAS_MSG) @@ -602,8 +602,8 @@ ACE_SOCK_Dgram::set_nic (const ACE_TCHAR *net_if, ACE_UNUSED_ARG (net_if); ACE_UNUSED_ARG (addr_family); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Send interface specification not ") - ACE_LIB_TEXT ("supported - IGNORED.\n"))); + ACE_TEXT ("Send interface specification not ") + ACE_TEXT ("supported - IGNORED.\n"))); #endif /* !IP_MULTICAST_IF */ return 0; diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 639a86d1612..b2a1f2e9204 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -81,8 +81,8 @@ ACE_SOCK_Dgram_Bcast::ACE_SOCK_Dgram_Bcast (const ACE_Addr &local, if (this->mk_broadcast (host_name) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Dgram_Bcast"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Dgram_Bcast"))); } // Here's the general-purpose open routine. diff --git a/ACE/ace/SOCK_Dgram_Mcast.cpp b/ACE/ace/SOCK_Dgram_Mcast.cpp index a303daa26ae..477527d55cf 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.cpp +++ b/ACE/ace/SOCK_Dgram_Mcast.cpp @@ -46,12 +46,12 @@ public: int clip_portnum) // clip port# info? { if (ip_addr.addr_to_string (ret_string, len, 1) == -1) - ACE_OS::strcpy (ret_string, ACE_LIB_TEXT ("<?>")); + ACE_OS::strcpy (ret_string, ACE_TEXT ("<?>")); else { - ACE_TCHAR *pc = ACE_OS::strrchr (ret_string, ACE_LIB_TEXT (':')); + ACE_TCHAR *pc = ACE_OS::strrchr (ret_string, ACE_TEXT (':')); if (clip_portnum && pc) - *pc = ACE_LIB_TEXT ('\0'); // clip port# info. + *pc = ACE_TEXT ('\0'); // clip port# info. } } // op== for ip_mreq structs. @@ -76,23 +76,23 @@ ACE_SOCK_Dgram_Mcast::dump (void) const ACE_TCHAR addr_string[MAXNAMELEN + 1]; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nOptions: bindaddr=%s, nulliface=%s\n"), + ACE_TEXT ("\nOptions: bindaddr=%s, nulliface=%s\n"), ACE_BIT_ENABLED (this->opts_, OPT_BINDADDR_YES) ? - ACE_LIB_TEXT ("<Bound>") : ACE_LIB_TEXT ("<Not Bound>"), + ACE_TEXT ("<Bound>") : ACE_TEXT ("<Not Bound>"), ACE_BIT_ENABLED (this->opts_, OPT_NULLIFACE_ALL) ? - ACE_LIB_TEXT ("<All Ifaces>") : ACE_LIB_TEXT ("<Default Iface>"))); + ACE_TEXT ("<All Ifaces>") : ACE_TEXT ("<Default Iface>"))); // Show default send addr, port#, and interface. ACE_SDM_helpers::addr_to_string (this->send_addr_, addr_string, sizeof addr_string, 0); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Send addr=%s iface=%s\n"), + ACE_TEXT ("Send addr=%s iface=%s\n"), addr_string, this->send_net_if_ ? this->send_net_if_ - : ACE_LIB_TEXT ("<default>"))); + : ACE_TEXT ("<default>"))); // Show list of subscribed addresses. - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Subscription list:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Subscription list:\n"))); ACE_MT (ACE_GUARD (ACE_SDM_LOCK, guard, this->subscription_list_lock_)); subscription_list_iter_t iter (this->subscription_list_); @@ -112,14 +112,14 @@ ACE_SOCK_Dgram_Mcast::dump (void) const ACE_NTOHL (pm->imr_interface.s_addr)); ACE_SDM_helpers::addr_to_string (if_addr, iface_string, sizeof iface_string, 1); - if (ACE_OS::strcmp (iface_string, ACE_LIB_TEXT ("0.0.0.0")) == 0) + if (ACE_OS::strcmp (iface_string, ACE_TEXT ("0.0.0.0")) == 0) // Receives on system default iface. (Note that null_iface_opt_ // option processing has already occurred.) - ACE_OS::strcpy (iface_string, ACE_LIB_TEXT ("<default>")); + ACE_OS::strcpy (iface_string, ACE_TEXT ("<default>")); // Dump info. ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\taddr=%s iface=%s\n"), + ACE_TEXT ("\taddr=%s iface=%s\n"), addr_string, iface_string)); } @@ -349,7 +349,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, { if (this->subscribe (mcast_addr, reuse_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) + ACE_TEXT ("0.0.0.0")) == 0) ++nr_subscribed; } else @@ -400,7 +400,7 @@ ACE_SOCK_Dgram_Mcast::subscribe_ifs (const ACE_INET_Addr &mcast_addr, { if (this->subscribe (mcast_addr, reuse_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) + ACE_TEXT ("0.0.0.0")) == 0) ++nr_subscribed; } else @@ -502,8 +502,8 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr, && sub_port_number != def_port_number) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Subscribed port# (%u) different than bound ") - ACE_LIB_TEXT ("port# (%u).\n"), + ACE_TEXT ("Subscribed port# (%u) different than bound ") + ACE_TEXT ("port# (%u).\n"), (u_int) sub_port_number, (u_int) def_port_number)); errno = ENXIO; @@ -525,8 +525,8 @@ ACE_SOCK_Dgram_Mcast::join (const ACE_INET_Addr &mcast_addr, ACE_SDM_helpers::addr_to_string (this->send_addr_, bound_addr_string, sizeof bound_addr_string, 1); ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Subscribed address (%s) different than ") - ACE_LIB_TEXT ("bound address (%s).\n"), + ACE_TEXT ("Subscribed address (%s) different than ") + ACE_TEXT ("bound address (%s).\n"), sub_addr_string, bound_addr_string)); errno = ENXIO; @@ -727,7 +727,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_cnt < 2) { if (this->leave (mcast_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) + ACE_TEXT ("0.0.0.0")) == 0) ++nr_unsubscribed; } else @@ -776,7 +776,7 @@ ACE_SOCK_Dgram_Mcast::unsubscribe_ifs (const ACE_INET_Addr &mcast_addr, if (if_cnt < 2) { if (this->leave (mcast_addr, - ACE_LIB_TEXT ("0.0.0.0")) == 0) + ACE_TEXT ("0.0.0.0")) == 0) ++nr_unsubscribed; } else @@ -952,10 +952,10 @@ ACE_SOCK_Dgram_Mcast::unsubscribe (void) // that either. :-( // Should this return -1? ACE_ERROR_RETURN ((LM_INFO, - ACE_LIB_TEXT ("ACE_SOCK_Dgram_Mcast::unsubscribe (void) ") - ACE_LIB_TEXT ("has been deprecated. You must either ") - ACE_LIB_TEXT ("close to socket to unsubscribe to all ") - ACE_LIB_TEXT ("or unsubscribe to each individually.\n")), + ACE_TEXT ("ACE_SOCK_Dgram_Mcast::unsubscribe (void) ") + ACE_TEXT ("has been deprecated. You must either ") + ACE_TEXT ("close to socket to unsubscribe to all ") + ACE_TEXT ("or unsubscribe to each individually.\n")), 0); } diff --git a/ACE/ace/SOCK_Netlink.cpp b/ACE/ace/SOCK_Netlink.cpp index dc23139c19c..3e6566767be 100644 --- a/ACE/ace/SOCK_Netlink.cpp +++ b/ACE/ace/SOCK_Netlink.cpp @@ -52,8 +52,8 @@ ACE_SOCK_Netlink::ACE_SOCK_Netlink (ACE_Netlink_Addr &local, protocol_family, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_Netlink"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_Netlink"))); } ssize_t diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp index 69d832c41d0..2a4664b1609 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp @@ -471,8 +471,8 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } // General purpose routine for performing server ACE_SOCK creation. @@ -564,8 +564,8 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Addr &local_sap, backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } // Multihomed version of same. @@ -583,8 +583,8 @@ ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor (const ACE_Multihomed_INET_ backlog, protocol) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Acceptor"))); } int diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp index 128beb23f22..7027b460fe7 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.cpp +++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp @@ -409,8 +409,8 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); } // Multihomed version of same @@ -436,8 +436,8 @@ ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector (ACE_SOCK_SEQPACK_Associa && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME || errno == ETIMEDOUT)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SOCK_SEQPACK_Connector::ACE_SOCK_SEQPACK_Connector"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SPIPE_Acceptor.cpp b/ACE/ace/SPIPE_Acceptor.cpp index ba5806bae29..b9b5d145dad 100644 --- a/ACE/ace/SPIPE_Acceptor.cpp +++ b/ACE/ace/SPIPE_Acceptor.cpp @@ -238,8 +238,8 @@ ACE_SPIPE_Acceptor::ACE_SPIPE_Acceptor (const ACE_SPIPE_Addr &local_sap, if (this->open (local_sap, reuse_addr, perms, sa, pipe_mode) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SPIPE_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SPIPE_Acceptor"))); } // General purpose routine for accepting new connections. diff --git a/ACE/ace/SPIPE_Addr.cpp b/ACE/ace/SPIPE_Addr.cpp index b4ec63e4fc3..bbba12f9242 100644 --- a/ACE/ace/SPIPE_Addr.cpp +++ b/ACE/ace/SPIPE_Addr.cpp @@ -108,20 +108,20 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, if (colonp == 0) // Assume it's a local name. { - ACE_OS::strcpy (temp, ACE_LIB_TEXT ( "\\\\.\\pipe\\")); + ACE_OS::strcpy (temp, ACE_TEXT ( "\\\\.\\pipe\\")); ACE_OS::strcat (temp, addr); } else { if (ACE_OS::strncmp (addr, - ACE_LIB_TEXT ("localhost"), + ACE_TEXT ("localhost"), ACE_OS::strlen ("localhost")) == 0) // change "localhost" to "." - ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\.")); + ACE_OS::strcpy (temp, ACE_TEXT ("\\\\.")); else { - ACE_OS::strcpy (temp, ACE_LIB_TEXT ("\\\\")); + ACE_OS::strcpy (temp, ACE_TEXT ("\\\\")); ACE_TCHAR *t; @@ -129,13 +129,13 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr, // NUL character into it. ACE_ALLOCATOR_RETURN (t, ACE_OS::strdup (addr), -1); - t[colonp - addr] = ACE_LIB_TEXT ('\0'); + t[colonp - addr] = ACE_TEXT ('\0'); ACE_OS::strcat (temp, t); ACE_OS::free (t); } - ACE_OS::strcat (temp, ACE_LIB_TEXT ("\\pipe\\")); + ACE_OS::strcat (temp, ACE_TEXT ("\\pipe\\")); ACE_OS::strcat (temp, colonp + 1); } len += static_cast<int> (ACE_OS::strlen (temp)); diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index e21388e7bae..80dd4c9e4ce 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -32,8 +32,8 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, if (this->connect (new_io, remote_sap, timeout, local_sap, reuse_addr, flags, perms, sa, pipe_mode) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("address %s, %p\n"), - remote_sap.get_path_name (), ACE_LIB_TEXT ("ACE_SPIPE_Connector"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("address %s, %p\n"), + remote_sap.get_path_name (), ACE_TEXT ("ACE_SPIPE_Connector"))); } void diff --git a/ACE/ace/SUN_Proactor.cpp b/ACE/ace/SUN_Proactor.cpp index c522f18d64b..8b280045b97 100644 --- a/ACE/ace/SUN_Proactor.cpp +++ b/ACE/ace/SUN_Proactor.cpp @@ -247,7 +247,7 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) switch (result->aio_lio_opcode) { case LIO_READ : - ptype = ACE_LIB_TEXT ("read"); + ptype = ACE_TEXT ("read"); ret_val = aioread (result->aio_fildes, (char *) result->aio_buf, result->aio_nbytes, @@ -257,7 +257,7 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) break; case LIO_WRITE : - ptype = ACE_LIB_TEXT ("write"); + ptype = ACE_TEXT ("write"); ret_val = aiowrite (result->aio_fildes, (char *) result->aio_buf, result->aio_nbytes, @@ -267,7 +267,7 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) break; default: - ptype = ACE_LIB_TEXT ("?????"); + ptype = ACE_TEXT ("?????"); ret_val = -1; break; } @@ -284,9 +284,9 @@ ACE_SUN_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result) ret_val = 1; else ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), + ACE_TEXT ("%N:%l:(%P | %t)::start_aio: aio%s %p\n"), ptype, - ACE_LIB_TEXT ("queueing failed\n"))); + ACE_TEXT ("queueing failed\n"))); } return ret_val; diff --git a/ACE/ace/SV_Message_Queue.cpp b/ACE/ace/SV_Message_Queue.cpp index 1be06f0f8cc..7f4c76b9b7a 100644 --- a/ACE/ace/SV_Message_Queue.cpp +++ b/ACE/ace/SV_Message_Queue.cpp @@ -37,8 +37,8 @@ ACE_SV_Message_Queue::ACE_SV_Message_Queue (key_t external_id, { ACE_TRACE ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"); if (this->open (external_id, create, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SV_Message_Queue::ACE_SV_Message_Queue"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SV_Semaphore_Complex.cpp b/ACE/ace/SV_Semaphore_Complex.cpp index ce3c0b07858..73d0ccdc01b 100644 --- a/ACE/ace/SV_Semaphore_Complex.cpp +++ b/ACE/ace/SV_Semaphore_Complex.cpp @@ -221,7 +221,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex"); if (this->open (k, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, @@ -240,7 +240,7 @@ ACE_SV_Semaphore_Complex::ACE_SV_Semaphore_Complex (const char *name, key = this->name_2_key (name); if (this->open (key, flags, initial_value, nsems, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore_Complex"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore_Complex"))); } ACE_SV_Semaphore_Complex::~ACE_SV_Semaphore_Complex (void) diff --git a/ACE/ace/SV_Semaphore_Simple.cpp b/ACE/ace/SV_Semaphore_Simple.cpp index 62d67f96260..6a6949e6f7f 100644 --- a/ACE/ace/SV_Semaphore_Simple.cpp +++ b/ACE/ace/SV_Semaphore_Simple.cpp @@ -114,7 +114,7 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (key_t k, { ACE_TRACE ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"); if (this->open (k, flags, initial_value, n, perms) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_SV_Semaphore::ACE_SV_Semaphore"))); } // Convert name to key. This function is used internally to create keys @@ -184,8 +184,8 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const char *name, n, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } #if defined (ACE_HAS_WCHAR) @@ -202,8 +202,8 @@ ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple (const wchar_t *name, nsems, perms) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SV_Semaphore_Simple::ACE_SV_Semaphore_Simple"))); } #endif /* ACE_HAS_WCHAR */ diff --git a/ACE/ace/SV_Shared_Memory.cpp b/ACE/ace/SV_Shared_Memory.cpp index ab56249cbe6..a2966307af0 100644 --- a/ACE/ace/SV_Shared_Memory.cpp +++ b/ACE/ace/SV_Shared_Memory.cpp @@ -53,8 +53,8 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (key_t external_id, ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->open_and_attach (external_id, sz, create, perms, virtual_addr, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } // The "do nothing" constructor. @@ -81,8 +81,8 @@ ACE_SV_Shared_Memory::ACE_SV_Shared_Memory (ACE_HANDLE int_id, { ACE_TRACE ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"); if (this->attach (0, flags) == -1) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_SV_Shared_Memory::ACE_SV_Shared_Memory"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp index 08639223cb8..473b5a7cfbc 100644 --- a/ACE/ace/Sample_History.cpp +++ b/ACE/ace/Sample_History.cpp @@ -48,9 +48,9 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, { const ACE_UINT64 val = this->samples_[i] / scale_factor; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s: ") + ACE_TEXT ("%s: ") ACE_SIZE_T_FORMAT_SPECIFIER - ACE_LIB_TEXT ("%Q\n"), + ACE_TEXT ("%Q\n"), msg, i, val)); diff --git a/ACE/ace/Sbrk_Memory_Pool.cpp b/ACE/ace/Sbrk_Memory_Pool.cpp index eda87a42c63..b747fb9ce15 100644 --- a/ACE/ace/Sbrk_Memory_Pool.cpp +++ b/ACE/ace/Sbrk_Memory_Pool.cpp @@ -20,7 +20,7 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, { ACE_TRACE ("ACE_Sbrk_Memory_Pool::acquire"); rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); void *cp = ACE_OS::sbrk (rounded_bytes); if (cp == MAP_FAILED) @@ -29,7 +29,7 @@ ACE_Sbrk_Memory_Pool::acquire (size_t nbytes, cp), 0); else - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d, new break = %u\n"), nbytes, rounded_bytes, cp)); return cp; } diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp index ae5e40cbdcc..dc1681a4a6b 100644 --- a/ACE/ace/Select_Reactor_Base.cpp +++ b/ACE/ace/Select_Reactor_Base.cpp @@ -469,12 +469,12 @@ ACE_Select_Reactor_Handler_Repository_Iterator::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Handler_Repository_Iterator::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rep_ = %u"), this->rep_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rep_ = %u"), this->rep_)); # ifdef ACE_WIN32 - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = "))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = "))); this->current_.dump (); # else - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("current_ = %@"), this->current_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("current_ = %@"), this->current_)); # endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -487,20 +487,20 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Handler_Repository::dump"); # ifdef ACE_WIN32 -# define ACE_HANDLE_FORMAT_SPECIFIER ACE_LIB_TEXT("%@") -# define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_LIB_TEXT("%u") +# define ACE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("%@") +# define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_TEXT("%u") # else -# define ACE_HANDLE_FORMAT_SPECIFIER ACE_LIB_TEXT("%d") -# define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_LIB_TEXT("%d") +# define ACE_HANDLE_FORMAT_SPECIFIER ACE_TEXT("%d") +# define ACE_MAX_HANDLEP1_FORMAT_SPECIFIER ACE_TEXT("%d") # endif /* ACE_WIN32 */ ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("max_handlep1_ = ") + ACE_TEXT ("max_handlep1_ = ") ACE_MAX_HANDLEP1_FORMAT_SPECIFIER - ACE_LIB_TEXT ("\n"), + ACE_TEXT ("\n"), this->max_handlep1 ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("["))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("["))); ACE_Event_Handler *event_handler = 0; @@ -508,14 +508,14 @@ ACE_Select_Reactor_Handler_Repository::dump (void) const iter.next (event_handler) != 0; iter.advance ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT (" (event_handler = %@,") - ACE_LIB_TEXT (" event_handler->handle_ = ") + ACE_TEXT (" (event_handler = %@,") + ACE_TEXT (" event_handler->handle_ = ") ACE_HANDLE_FORMAT_SPECIFIER - ACE_LIB_TEXT ("\n"), + ACE_TEXT ("\n"), event_handler, event_handler->get_handle ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT (" ]\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" ]\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -577,7 +577,7 @@ ACE_Select_Reactor_Notify::dump (void) const ACE_TRACE ("ACE_Select_Reactor_Notify::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("select_reactor_ = %x"), this->select_reactor_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("select_reactor_ = %x"), this->select_reactor_)); this->notification_pipe_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -837,7 +837,7 @@ ACE_Select_Reactor_Notify::dispatch_notify (ACE_Notification_Buffer &buffer) default: // Should we bail out if we get an invalid mask? ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("invalid mask = %d\n"), + ACE_TEXT ("invalid mask = %d\n"), buffer.mask_)); } diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp index 92965451dea..0831b77f7a9 100644 --- a/ACE/ace/Select_Reactor_T.cpp +++ b/ACE/ace/Select_Reactor_T.cpp @@ -430,8 +430,8 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::open disable_notify_pipe) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("notification pipe open failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("notification pipe open failed"))); result = -1; } @@ -515,10 +515,10 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") - ACE_LIB_TEXT ("failed inside ") - ACE_LIB_TEXT ("ACE_Select_Reactor_T::CTOR"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Select_Reactor_T::open ") + ACE_TEXT ("failed inside ") + ACE_TEXT ("ACE_Select_Reactor_T::CTOR"))); } } @@ -549,9 +549,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::ACE_Select_Reactor_T disable_notify_pipe, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Select_Reactor_T::open ") - ACE_LIB_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Select_Reactor_T::open ") + ACE_TEXT ("failed inside ACE_Select_Reactor_T::CTOR"))); } // Close down the ACE_Select_Reactor_T instance, detaching any @@ -1247,7 +1247,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - EXCEPT\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::EXCEPT_MASK, @@ -1259,7 +1259,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch_io_handlers return -1; } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Select_Reactor_T::dispatch - READ\n"))); if (this->dispatch_io_set (number_of_active_handles, number_of_handlers_dispatched, ACE_Event_Handler::READ_MASK, @@ -1543,51 +1543,51 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dump (void) const this->handler_rep_.dump (); this->signal_handler_->dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("delete_signal_handler_ = %d\n"), + ACE_TEXT ("delete_signal_handler_ = %d\n"), this->delete_signal_handler_)); ACE_HANDLE h; for (ACE_Handle_Set_Iterator handle_iter_wr (this->wait_set_.wr_mask_); (h = handle_iter_wr ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd (this->wait_set_.rd_mask_); (h = handle_iter_rd ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex (this->wait_set_.ex_mask_); (h = handle_iter_ex ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_wr_ready (this->ready_set_.wr_mask_); (h = handle_iter_wr_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_rd_ready (this->ready_set_.rd_mask_); (h = handle_iter_rd_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_ex_ready (this->ready_set_.ex_mask_); (h = handle_iter_ex_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_ready = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_ready = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.wr_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("write_handle_suspend = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("write_handle_suspend = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.rd_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("read_handle_suspend = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("read_handle_suspend = %d\n"), h)); for (ACE_Handle_Set_Iterator handle_iter_su_ready (this->suspend_set_.ex_mask_); (h = handle_iter_su_ready ()) != ACE_INVALID_HANDLE;) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("except_handle_suspend = %d\n"), h)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("except_handle_suspend = %d\n"), h)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("restart_ = %d\n"), this->restart_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("requeue_position_ = %d\n"), this->requeue_position_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("initialized_ = %d\n"), this->initialized_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owner_ = %d\n"), this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("restart_ = %d\n"), this->restart_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("requeue_position_ = %d\n"), this->requeue_position_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("initialized_ = %d\n"), this->initialized_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owner_ = %d\n"), this->owner_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->notify_handler_->dump (); diff --git a/ACE/ace/Semaphore.cpp b/ACE/ace/Semaphore.cpp index 69e247306e4..06de81756ed 100644 --- a/ACE/ace/Semaphore.cpp +++ b/ACE/ace/Semaphore.cpp @@ -23,7 +23,7 @@ ACE_Semaphore::dump (void) const // ACE_TRACE ("ACE_Semaphore::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -48,8 +48,8 @@ ACE_Semaphore::ACE_Semaphore (unsigned int count, name, arg, max) != 0) #endif ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Semaphore::ACE_Semaphore"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Semaphore::ACE_Semaphore"))); } ACE_Semaphore::~ACE_Semaphore (void) diff --git a/ACE/ace/Service_Config.cpp b/ACE/ace/Service_Config.cpp index d24bd2c0021..5b911585a6a 100644 --- a/ACE/ace/Service_Config.cpp +++ b/ACE/ace/Service_Config.cpp @@ -47,8 +47,8 @@ ACE_Service_Config_Guard::ACE_Service_Config_Guard (ACE_Service_Gestalt * psg) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) Service_Config_Guard:<ctor>") - ACE_LIB_TEXT (" - repo=%@ superceded by repo=%@\n"), + ACE_TEXT ("ACE (%P|%t) Service_Config_Guard:<ctor>") + ACE_TEXT (" - repo=%@ superceded by repo=%@\n"), this->saved_->repo_, psg->repo_)); @@ -63,8 +63,8 @@ ACE_Service_Config_Guard::~ACE_Service_Config_Guard (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) Service_Config_Guard:<dtor>") - ACE_LIB_TEXT (" - new repo=%@\n"), + ACE_TEXT ("ACE (%P|%t) Service_Config_Guard:<dtor>") + ACE_TEXT (" - new repo=%@\n"), this->saved_->repo_)); } @@ -109,7 +109,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) // base class for further parsing. ACE_Get_Opt getopt (argc, argv, - ACE_LIB_TEXT ("bs:p:"), + ACE_TEXT ("bs:p:"), 1 , // Start at argv[1]. 0, // Do not report errors ACE_Get_Opt::RETURN_IN_ORDER); @@ -140,7 +140,7 @@ ACE_Service_Config::parse_args_i (int argc, ACE_TCHAR *argv[]) (ACE_Service_Config::signum_, ACE_Service_Config::signal_handler_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("cannot obtain signal handler\n")), + ACE_TEXT ("cannot obtain signal handler\n")), -1); #endif /* ACE_LACKS_UNIX_SIGNALS */ break; @@ -198,7 +198,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], if (this->pid_file_name_ != 0) { FILE* pidf = ACE_OS::fopen (this->pid_file_name_, - ACE_LIB_TEXT("w")); + ACE_TEXT("w")); if (pidf != 0) { @@ -233,7 +233,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], { if (ACE::debug ()) ACE_DEBUG ((LM_STARTUP, - ACE_LIB_TEXT ("starting up daemon %n\n"))); + ACE_TEXT ("starting up daemon %n\n"))); // Initialize the Service Repository (this will still work if // user forgets to define an object of type ACE_Service_Config). @@ -255,7 +255,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], if (ACE_Reactor::instance ()->register_handler (ss, ACE_Service_Config::signal_handler_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("can't register signal handler\n"))); + ACE_TEXT ("can't register signal handler\n"))); } #endif /* ACE_LACKS_UNIX_SIGNALS */ } @@ -271,7 +271,7 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], if (!ignore_default_svc_conf_file) { FILE *fp = ACE_OS::fopen (ACE_DEFAULT_SVC_CONF, - ACE_LIB_TEXT ("r")); + ACE_TEXT ("r")); ignore_default_svc_conf_file = (fp == 0); if (fp != 0) ACE_OS::fclose (fp); @@ -286,10 +286,10 @@ ACE_Service_Config::open_i (const ACE_TCHAR program_name[], (ACE_TString (ACE_DEFAULT_SVC_CONF)) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueuing ") + ACE_TEXT ("%p\n"), + ACE_TEXT ("enqueuing ") ACE_DEFAULT_SVC_CONF - ACE_LIB_TEXT(" file")), + ACE_TEXT(" file")), -1); } } @@ -367,8 +367,9 @@ ACE_Service_Config::resume (const ACE_TCHAR svc_name[]) // cleaned up. // Note that the tss_ member will be destroyed with the ACE_Object_Manager's // ACE_Service_Config singleton, so no leaks are introduced. -template<> void -ACE_TSS<ACE_Service_Gestalt>::cleanup (void*) +template<> +void +ACE_TSS<ACE_Service_Gestalt>::cleanup (void* ptr) { // We need this because the SC instance is really owned by the Object // Manager and the TSS cleanup must not dispose of it prematurely. @@ -441,7 +442,7 @@ ACE_Service_Config::create_service_type_impl (const ACE_TCHAR *name, break; default: ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("unknown case\n"))); + ACE_TEXT ("unknown case\n"))); break; } return stp; @@ -463,7 +464,7 @@ ACE_Service_Config::ACE_Service_Config (const ACE_TCHAR program_name[], // Only print out an error if it wasn't the svc.conf file that was // missing. ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) SC failed to open: %p\n"), + ACE_TEXT ("(%P|%t) SC failed to open: %p\n"), program_name)); } } @@ -500,13 +501,13 @@ ACE_Service_Config::reconfigure (void) #endif /* ! ACE_NLOGGING */ if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("beginning reconfiguration at %s"), + ACE_TEXT ("beginning reconfiguration at %s"), ACE_OS::ctime (&t))); } if (ACE_Service_Config::process_directives () == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("process_directives"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("process_directives"))); } // Tidy up and perform last rites on a terminating ACE_Service_Config. diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 853e3859744..79bc0df7ed0 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -41,48 +41,48 @@ class ACE_DLL; #if (ACE_USES_CLASSIC_SVC_CONF == 1) #define ACE_STATIC_SERVICE_DIRECTIVE(ident, parameters) \ - ACE_LIB_TEXT ("static ") \ - ACE_LIB_TEXT (ident) \ - ACE_LIB_TEXT (" \"") \ - ACE_LIB_TEXT (parameters) \ - ACE_LIB_TEXT ("\"") + ACE_TEXT ("static ") \ + ACE_TEXT (ident) \ + ACE_TEXT (" \"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"") #define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ - ACE_LIB_TEXT ("dynamic ") \ - ACE_LIB_TEXT (ident) \ - ACE_LIB_TEXT (" Service_Object * ") \ - ACE_LIB_TEXT (libpathname) \ - ACE_LIB_TEXT (":") \ - ACE_LIB_TEXT (objectclass) \ - ACE_LIB_TEXT ("() \"") \ - ACE_LIB_TEXT (parameters) \ - ACE_LIB_TEXT ("\"") + ACE_TEXT ("dynamic ") \ + ACE_TEXT (ident) \ + ACE_TEXT (" Service_Object * ") \ + ACE_TEXT (libpathname) \ + ACE_TEXT (":") \ + ACE_TEXT (objectclass) \ + ACE_TEXT ("() \"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"") #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ - ACE_LIB_TEXT ("remove ") \ - ACE_LIB_TEXT (ident) + ACE_TEXT ("remove ") \ + ACE_TEXT (ident) class ACE_Svc_Conf_Param; #else #define ACE_STATIC_SERVICE_DIRECTIVE(ident, parameters) \ - ACE_LIB_TEXT ("<ACE_Svc_Conf><static id=\"") \ - ACE_LIB_TEXT (ident) \ - ACE_LIB_TEXT ("\" params=\"") \ - ACE_LIB_TEXT (parameters) \ - ACE_LIB_TEXT ("\"/></ACE_Svc_Conf>") + ACE_TEXT ("<ACE_Svc_Conf><static id=\"") \ + ACE_TEXT (ident) \ + ACE_TEXT ("\" params=\"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"/></ACE_Svc_Conf>") #define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ - ACE_LIB_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \ - ACE_LIB_TEXT (ident) \ - ACE_LIB_TEXT ("\" type=\"Service_Object\">") \ - ACE_LIB_TEXT ("<initializer path=\"") \ - ACE_LIB_TEXT (libpathname) \ - ACE_LIB_TEXT ("\" init=\"") \ - ACE_LIB_TEXT (objectclass) \ - ACE_LIB_TEXT ("\"") \ - ACE_LIB_TEXT (" params=\"") \ - ACE_LIB_TEXT (parameters) \ - ACE_LIB_TEXT ("\"/></dynamic></ACE_Svc_Conf>") + ACE_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \ + ACE_TEXT (ident) \ + ACE_TEXT ("\" type=\"Service_Object\">") \ + ACE_TEXT ("<initializer path=\"") \ + ACE_TEXT (libpathname) \ + ACE_TEXT ("\" init=\"") \ + ACE_TEXT (objectclass) \ + ACE_TEXT ("\"") \ + ACE_TEXT (" params=\"") \ + ACE_TEXT (parameters) \ + ACE_TEXT ("\"/></dynamic></ACE_Svc_Conf>") #define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ - ACE_LIB_TEXT ("<ACE_Svc_Conf><remove id=\"") \ - ACE_LIB_TEXT (ident) \ - ACE_LIB_TEXT ("\"></remove></ACE_Svc_Conf>") + ACE_TEXT ("<ACE_Svc_Conf><remove id=\"") \ + ACE_TEXT (ident) \ + ACE_TEXT ("\"></remove></ACE_Svc_Conf>") class ACE_XML_Svc_Conf; #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp index f8ce063b69e..a28db7c496d 100644 --- a/ACE/ace/Service_Gestalt.cpp +++ b/ACE/ace/Service_Gestalt.cpp @@ -71,8 +71,8 @@ ACE_Service_Type_Dynamic_Guard::ACE_Service_Type_Dynamic_Guard if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@ [%d], ") - ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - inserting dummy forward\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<ctor>, repo=%@ [%d], ") + ACE_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - inserting dummy forward\n"), &this->repo_, this->repo_begin_, this->name_, this->dummy_, this->dummy_->type (), (this->dummy_->type () != 0) ? this->dummy_->type ()->object () : 0, @@ -103,7 +103,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) { if (ACE::debug ()) ACE_ERROR ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<dtor> - Failed (%d) to find %s\n"), ret, this->name_)); return; } @@ -115,7 +115,7 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, name=%s - updating [%d - %d]\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, name=%s - updating [%d - %d]\n"), &this->repo_, this->name_, this->repo_begin_, @@ -134,8 +134,8 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") - ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - loaded\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@ [%d], ") + ACE_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - loaded\n"), &this->repo_, this->repo_begin_, this->name_, tmp, tmp->type (), (tmp->type () != 0) ? tmp->type ()->object () : 0, tmp->active ())); @@ -144,8 +144,8 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) { if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, ") - ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - removing dummy forward\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, ") + ACE_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d - removing dummy forward\n"), &this->repo_, this->name_, this->dummy_, this->dummy_->type (), (this->dummy_->type () != 0) ? this->dummy_->type ()->object () : 0, this->dummy_->active ())); @@ -164,8 +164,8 @@ ACE_Service_Type_Dynamic_Guard::~ACE_Service_Type_Dynamic_Guard (void) else { ACE_ERROR ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, name=%s, ") - ACE_LIB_TEXT ("type=%@, impl=%@, object=%@, active=%d - dummy remove failed\n"), + ACE_TEXT ("ACE (%P|%t) STDG::<dtor>, repo=%@, name=%s, ") + ACE_TEXT ("type=%@, impl=%@, object=%@, active=%d - dummy remove failed\n"), &this->repo_, this->name_, this->dummy_, this->dummy_->type (), (this->dummy_->type () != 0) ? this->dummy_->type ()->object () : 0, this->dummy_->active ())); @@ -210,7 +210,7 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::dtor - this=%@, pss = %@\n"), + ACE_TEXT ("ACE (%P|%t) SG::dtor - this=%@, pss = %@\n"), this, this->processed_static_svcs_)); #endif @@ -248,7 +248,7 @@ ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size, #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"), + ACE_TEXT ("ACE (%P|%t) SG::ctor - this = %@, pss = %@\n"), this, this->processed_static_svcs_)); #endif } @@ -405,8 +405,8 @@ ACE_Service_Gestalt::add_processed_static_svc if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::add_processed_statisc_svc, ") - ACE_LIB_TEXT ("repo=%@ - %s\n"), + ACE_TEXT ("ACE (%P|%t) SG::add_processed_statisc_svc, ") + ACE_TEXT ("repo=%@ - %s\n"), this->repo_, assd->name_)); } @@ -455,9 +455,9 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, if (ACE::debug ()) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ") - ACE_LIB_TEXT ("looking up static ") - ACE_LIB_TEXT ("service \'%s\' to initialize\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - () repo=%@, ") + ACE_TEXT ("looking up static ") + ACE_TEXT ("service \'%s\' to initialize\n"), this->repo_, svc_name)); } @@ -476,16 +476,16 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, else { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") - ACE_LIB_TEXT (" was not located.\n"), + ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") + ACE_TEXT (" was not located.\n"), svc_name), -1); } } if (srp == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") - ACE_LIB_TEXT (" was not located.\n"), + ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - service \'%s\'") + ACE_TEXT (" was not located.\n"), svc_name), -1); @@ -495,8 +495,8 @@ ACE_Service_Gestalt::initialize (const ACE_TCHAR *svc_name, { // ... report and remove this entry. ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) ERROR: SG::initialize - static init of \'%s\'") - ACE_LIB_TEXT (" failed (%p)\n"), + ACE_TEXT ("ACE (%P|%t) ERROR: SG::initialize - static init of \'%s\'") + ACE_TEXT (" failed (%p)\n"), svc_name)); this->repo_->remove (svc_name); return -1; @@ -518,8 +518,8 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, looking up dynamic ") - ACE_LIB_TEXT ("service \'%s\' to initialize\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@, looking up dynamic ") + ACE_TEXT ("service \'%s\' to initialize\n"), this->repo_, stf->name ())); #endif @@ -537,9 +537,9 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_ERROR_RETURN ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") - ACE_LIB_TEXT (" %s is already initialized.") - ACE_LIB_TEXT (" Remove before re-initializing.\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") + ACE_TEXT (" %s is already initialized.") + ACE_TEXT (" Remove before re-initializing.\n"), this->repo_, stf->name ()), 0); @@ -559,10 +559,10 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type_Factory *stf, // recursion here. if (retv == -2 && srp->type () == 0) ACE_ERROR_RETURN ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") - ACE_LIB_TEXT (" %s is forward-declared.") - ACE_LIB_TEXT (" Recursive initialization requests are") - ACE_LIB_TEXT (" not supported.\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - repo=%@,") + ACE_TEXT (" %s is forward-declared.") + ACE_TEXT (" Recursive initialization requests are") + ACE_TEXT (" not supported.\n"), this->repo_, stf->name ()), -1); @@ -616,17 +616,17 @@ ACE_Service_Gestalt::initialize (const ACE_Service_Type *sr, if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - looking up dynamic ") - ACE_LIB_TEXT (" service %s to initialize, repo=%@\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - looking up dynamic ") + ACE_TEXT (" service %s to initialize, repo=%@\n"), sr->name (), this->repo_)); ACE_Service_Type *srp = 0; if (this->repo_->find (sr->name (), (const ACE_Service_Type **) &srp) >= 0) ACE_ERROR_RETURN ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize - \'%s\' ") - ACE_LIB_TEXT ("has already been installed. ") - ACE_LIB_TEXT ("Remove before reinstalling\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize - \'%s\' ") + ACE_TEXT ("has already been installed. ") + ACE_TEXT ("Remove before reinstalling\n"), sr->name ()), 0); @@ -653,8 +653,8 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) ACE_ERROR_RETURN ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) SG::initialize_i ") - ACE_LIB_TEXT ("failed for %s: %m\n"), + ACE_TEXT ("ACE (%P|%t) SG::initialize_i ") + ACE_TEXT ("failed for %s: %m\n"), sr->name ()), -1); #endif @@ -667,8 +667,8 @@ ACE_Service_Gestalt::initialize_i (const ACE_Service_Type *sr, // Not using LM_ERROR here to avoid confusing the test harness if (ACE::debug ()) ACE_ERROR_RETURN ((LM_WARNING, - ACE_LIB_TEXT ("ACE (%P|%t) SG - repository insert ") - ACE_LIB_TEXT ("failed for %s: %m\n"), + ACE_TEXT ("ACE (%P|%t) SG - repository insert ") + ACE_TEXT ("failed for %s: %m\n"), sr->name ()), -1); #endif @@ -780,11 +780,11 @@ ACE_Service_Gestalt::process_directive_i (const ACE_Static_Svc_Descriptor &ssd, #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directive_i, ") - ACE_LIB_TEXT ("repo=%@ - %s, dll=%s, force=%d\n"), + ACE_TEXT ("ACE (%P|%t) SG::process_directive_i, ") + ACE_TEXT ("repo=%@ - %s, dll=%s, force=%d\n"), this->repo_, ssd.name_, - (tmp_dll.dll_name_ == 0) ? ACE_LIB_TEXT ("<null>") : tmp_dll.dll_name_, + (tmp_dll.dll_name_ == 0) ? ACE_TEXT ("<null>") : tmp_dll.dll_name_, force_replace)); #endif @@ -814,8 +814,8 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directives_i, ") - ACE_LIB_TEXT ("repo=%@ - %s\n"), + ACE_TEXT ("ACE (%P|%t) SG::process_directives_i, ") + ACE_TEXT ("repo=%@ - %s\n"), this->repo_, (param->type == ACE_Svc_Conf_Param::SVC_CONF_FILE) ? ACE_TEXT ("<from file>") @@ -842,20 +842,20 @@ ACE_Service_Gestalt::process_directives_i (ACE_Svc_Conf_Param *param) ACE_XML_Svc_Conf * ACE_Service_Gestalt::get_xml_svc_conf (ACE_DLL &xmldll) { - if (xmldll.open (ACE_LIB_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1) + if (xmldll.open (ACE_TEXT ("ACEXML_XML_Svc_Conf_Parser")) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"), + ACE_TEXT ("ACE (%P|%t) Failure to open ACEXML_XML_Svc_Conf_Parser: %p\n"), "ACE_Service_Config::get_xml_svc_conf"), 0); void * foo = - xmldll.symbol (ACE_LIB_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); + xmldll.symbol (ACE_TEXT ("_ACEXML_create_XML_Svc_Conf_Object")); ACE_XML_Svc_Conf::Factory factory = reinterpret_cast<ACE_XML_Svc_Conf::Factory> (foo); if (factory == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"), + ACE_TEXT ("ACE (%P|%t) Unable to resolve factory: %p\n"), xmldll.error ()), 0); @@ -894,7 +894,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) int result = 0; FILE *fp = ACE_OS::fopen (file, - ACE_LIB_TEXT ("r")); + ACE_TEXT ("r")); if (fp == 0) { @@ -902,7 +902,7 @@ ACE_Service_Gestalt::process_file (const ACE_TCHAR file[]) // the method. if (ACE::debug ()) ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t): %p\n"), + ACE_TEXT ("ACE (%P|%t): %p\n"), file)); // Use stat to find out if the file exists. I didn't use access() @@ -947,7 +947,7 @@ ACE_Service_Gestalt::process_directive (const ACE_TCHAR directive[]) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"), + ACE_TEXT ("ACE (%P|%t) SG::process_directive, repo=%@ - %s\n"), this->repo_, directive)); #endif @@ -997,8 +997,8 @@ ACE_Service_Gestalt::init_svc_conf_file_queue (void) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ") - ACE_LIB_TEXT ("- this=%@, repo=%@\n"), + ACE_TEXT ("ACE (%P|%t) SG::init_svc_conf_file_queue ") + ACE_TEXT ("- this=%@, repo=%@\n"), this, this->repo_)); #endif @@ -1104,8 +1104,8 @@ ACE_Service_Gestalt::process_commandline_directives (void) if (this->process_directive ((sptr->fast_rep ())) != 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) %p\n"), - ACE_LIB_TEXT ("process_directive"))); + ACE_TEXT ("ACE (%P|%t) %p\n"), + ACE_TEXT ("process_directive"))); result = -1; } } @@ -1132,7 +1132,7 @@ ACE_Service_Gestalt::parse_args_i (int argc, ACE_TCHAR *argv[]) ACE_TRACE ("ACE_Service_Gestalt::parse_args_i"); ACE_Get_Opt getopt (argc, argv, - ACE_LIB_TEXT ("df:k:nyp:s:S:"), + ACE_TEXT ("df:k:nyp:s:S:"), 1); // Start at argv[1]. if (this->init_svc_conf_file_queue () == -1) @@ -1147,8 +1147,8 @@ ACE_Service_Gestalt::parse_args_i (int argc, ACE_TCHAR *argv[]) case 'f': if (this->svc_conf_file_queue_->enqueue_tail (ACE_TString (getopt.opt_arg ())) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_tail")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("enqueue_tail")), -1); break; case 'k': @@ -1174,14 +1174,14 @@ ACE_Service_Gestalt::parse_args_i (int argc, ACE_TCHAR *argv[]) if (this->svc_queue_->enqueue_tail (ACE_TString (getopt.opt_arg ())) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("enqueue_tail")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("enqueue_tail")), -1); break; default: if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"), + ACE_TEXT ("ACE (%P|%t) %c is not a ACE_Service_Config option\n"), c)); } @@ -1254,7 +1254,7 @@ ACE_Service_Gestalt::close (void) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"), + ACE_TEXT ("ACE (%P|%t) SG::close - complete this=%@, repo=%@, owned=%d\n"), this, this->repo_, this->svc_repo_is_owned_)); #endif diff --git a/ACE/ace/Service_Manager.cpp b/ACE/ace/Service_Manager.cpp index cf99c39b7aa..f32e03b4d82 100644 --- a/ACE/ace/Service_Manager.cpp +++ b/ACE/ace/Service_Manager.cpp @@ -80,10 +80,10 @@ ACE_Service_Manager::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%d/%s %s"), + ACE_TEXT ("%d/%s %s"), sa.get_port_number (), - ACE_LIB_TEXT ("tcp"), - ACE_LIB_TEXT ("# lists all services in the daemon\n")); + ACE_TEXT ("tcp"), + ACE_TEXT ("# lists all services in the daemon\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) return -1; else @@ -96,7 +96,7 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) { ACE_TRACE ("ACE_Service_Manager::init"); ACE_INET_Addr local_addr (ACE_Service_Manager::DEFAULT_PORT_); - ACE_Get_Opt getopt (argc, argv, ACE_LIB_TEXT ("dp:s:"), 0); // Start at argv[0] + ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("dp:s:"), 0); // Start at argv[0] for (int c; (c = getopt ()) != -1; ) switch (c) @@ -117,13 +117,13 @@ ACE_Service_Manager::init (int argc, ACE_TCHAR *argv[]) if (this->get_handle () == ACE_INVALID_HANDLE && this->open (local_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("open")), -1); + ACE_TEXT ("%p\n"), + ACE_TEXT ("open")), -1); else if (ACE_Reactor::instance ()->register_handler (this, ACE_Event_Handler::ACCEPT_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("registering service with ACE_Reactor\n")), + ACE_TEXT ("registering service with ACE_Reactor\n")), -1); return 0; } @@ -185,8 +185,8 @@ ACE_Service_Manager::list_services (void) ACE_OS::strcpy (buf, sr->name ()); ACE_OS::strcat (buf, (sr->active ()) ? - ACE_LIB_TEXT (" (active) ") : - ACE_LIB_TEXT (" (paused) ")); + ACE_TEXT (" (active) ") : + ACE_TEXT (" (paused) ")); p[-1] = ' '; p[0] = '\0'; @@ -195,18 +195,18 @@ ACE_Service_Manager::list_services (void) if (this->debug_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("len = %d, info = %s%s"), + ACE_TEXT ("len = %d, info = %s%s"), len, buf, - buf[len - 1] == '\n' ? ACE_LIB_TEXT ("") : ACE_LIB_TEXT ("\n"))); + buf[len - 1] == '\n' ? ACE_TEXT ("") : ACE_TEXT ("\n"))); if (len > 0) { ssize_t n = this->client_stream_.send_n (buf, len); if (n <= 0 && errno != EPIPE) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("send_n"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n"))); } } @@ -252,10 +252,10 @@ ACE_Service_Manager::process_request (ACE_TCHAR *request) *p = '\0'; - if (ACE_OS::strcmp (request, ACE_LIB_TEXT ("help")) == 0) + if (ACE_OS::strcmp (request, ACE_TEXT ("help")) == 0) // Return a list of the configured services. this->list_services (); - else if (ACE_OS::strcmp (request, ACE_LIB_TEXT ("reconfigure") )== 0) + else if (ACE_OS::strcmp (request, ACE_TEXT ("reconfigure") )== 0) // Trigger a reconfiguration by re-reading the local <svc.conf> file. this->reconfigure_services (); else @@ -293,14 +293,14 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->debug_) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("client_stream fd = %d\n"), + ACE_TEXT ("client_stream fd = %d\n"), this->client_stream_.get_handle ())); ACE_INET_Addr sa; if (this->client_stream_.get_remote_addr (sa) == -1) return -1; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("accepted from host %s at port %d\n"), + ACE_TEXT ("accepted from host %s at port %d\n"), ACE_TEXT_CHAR_TO_TCHAR (sa.get_host_name ()), sa.get_port_number ())); } @@ -332,7 +332,7 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if ((remaining -= result) <= 0) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("Request buffer overflow.\n"))); + ACE_TEXT ("Request buffer overflow.\n"))); result = 0; break; } @@ -352,8 +352,8 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) case -1: if (this->debug_) ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("recv"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("recv"))); break; case 0: return 0; @@ -376,8 +376,8 @@ ACE_Service_Manager::handle_input (ACE_HANDLE) if (this->client_stream_.close () == -1 && this->debug_) ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("close"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("close"))); return 0; } diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp index 413d501833f..422b22b4d70 100644 --- a/ACE/ace/Service_Repository.cpp +++ b/ACE/ace/Service_Repository.cpp @@ -127,8 +127,8 @@ ACE_Service_Repository::ACE_Service_Repository (size_t size) if (this->open (size) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Service_Repository"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Service_Repository"))); } // Finalize (call <fini> and possibly delete) all the services. @@ -160,8 +160,8 @@ ACE_Service_Repository::fini (void) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] (%d), ") - ACE_LIB_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d\n"), + ACE_TEXT ("ACE (%P|%t) SR::fini, repo=%@ [%d] (%d), ") + ACE_TEXT ("name=%s, type=%@, impl=%@, object=%@, active=%d\n"), this, i, this->total_size_, s->name(), s->type (), (s->type () != 0) ? s->type ()->object () : 0, s->active ())); @@ -195,7 +195,7 @@ ACE_Service_Repository::close (void) #ifndef ACE_NLOGGING if(ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) SR::close, this=%@, size=%d\n"), + ACE_TEXT ("(%P|%t) SR::close, this=%@, size=%d\n"), this, this->current_size_)); #endif @@ -209,7 +209,7 @@ ACE_Service_Repository::close (void) #ifndef ACE_NLOGGING if(ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) SR::close, this=%@, delete so[%d]=%@ (%s)\n"), + ACE_TEXT ("(%P|%t) SR::close, this=%@, delete so[%d]=%@ (%s)\n"), this, i, this->service_vector_[i], this->service_vector_[i]->name ())); @@ -379,9 +379,9 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SR::insert") - ACE_LIB_TEXT (" - repo=%@ [%d] (%d), name=%s") - ACE_LIB_TEXT (", type=%@, object=%@, active=%d\n"), + ACE_TEXT ("ACE (%P|%t) SR::insert") + ACE_TEXT (" - repo=%@ [%d] (%d), name=%s") + ACE_TEXT (", type=%@, object=%@, active=%d\n"), this, i, this->total_size_, sr->name(), sr->type (), (sr->type () != 0) ? sr->type ()->object () : 0, sr->active ())); @@ -394,9 +394,9 @@ ACE_Service_Repository::insert (const ACE_Service_Type *sr) #ifndef ACE_NLOGGING if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ACE (%P|%t) SR::insert") - ACE_LIB_TEXT (" - destroying (replacing), repo=%@ [%d] (%d), name=%s") - ACE_LIB_TEXT (", type=%@, object=%@, active=%d\n"), + ACE_TEXT ("ACE (%P|%t) SR::insert") + ACE_TEXT (" - destroying (replacing), repo=%@ [%d] (%d), name=%s") + ACE_TEXT (", type=%@, object=%@, active=%d\n"), this, i, this->total_size_, s->name(), s->type (), (s->type () != 0) ? s->type ()->object () : 0, s->active ())); diff --git a/ACE/ace/Service_Types.cpp b/ACE/ace/Service_Types.cpp index 86ee6229bce..20665ea2c7d 100644 --- a/ACE/ace/Service_Types.cpp +++ b/ACE/ace/Service_Types.cpp @@ -60,7 +60,7 @@ ACE_Service_Type_Impl::fini (void) const ACE_TRACE ("ACE_Service_Type_Impl::fini"); if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("destroying %s, flags = %d\n"), + ACE_TEXT ("destroying %s, flags = %d\n"), this->name_, this->flags_)); @@ -259,9 +259,9 @@ ACE_Module_Type::info (ACE_TCHAR **str, size_t len) const ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s"), + ACE_TEXT ("%s\t %s"), this->name (), - ACE_LIB_TEXT ("# ACE_Module\n")); + ACE_TEXT ("# ACE_Module\n")); if (*str == 0 && (*str = ACE_OS::strdup (buf)) == 0) return -1; @@ -348,9 +348,9 @@ ACE_Stream_Type::info (ACE_TCHAR **str, size_t len) const ACE_TCHAR buf[BUFSIZ]; ACE_OS::sprintf (buf, - ACE_LIB_TEXT ("%s\t %s"), + ACE_TEXT ("%s\t %s"), this->name (), - ACE_LIB_TEXT ("# STREAM\n")); + ACE_TEXT ("# STREAM\n")); if (*str == 0 && (*str = ACE_OS::strdup (buf)) == 0) return -1; diff --git a/ACE/ace/Shared_Memory_Pool.cpp b/ACE/ace/Shared_Memory_Pool.cpp index 007f1c73ab5..44c346ea389 100644 --- a/ACE/ace/Shared_Memory_Pool.cpp +++ b/ACE/ace/Shared_Memory_Pool.cpp @@ -50,11 +50,11 @@ ACE_Shared_Memory_Pool::in_use (ACE_OFF_T &offset, { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("shmctl")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("shmctl")), -1); offset += buf.shm_segsz; - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -76,8 +76,8 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, { if (ACE_OS::shmctl (st[counter].shmid_, IPC_STAT, &buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("shmctl")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("shmctl")), -1); offset += buf.shm_segsz; @@ -90,7 +90,7 @@ ACE_Shared_Memory_Pool::find_seg (const void* const searchPtr, offset -= buf.shm_segsz; return 0; } - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) segment size = %d, offset = %d\n"), buf.shm_segsz, offset)); } return 0; @@ -122,8 +122,8 @@ ACE_Shared_Memory_Pool::commit_backing_store_name (size_t rounded_bytes, this->file_perms_ | IPC_CREAT | IPC_EXCL); if (shmid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("shmget")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("shmget")), -1); st[counter].shmid_ = shmid; st[counter].used_ = 1; @@ -150,7 +150,7 @@ int ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) { ACE_TRACE ("ACE_Shared_Memory_Pool::handle_signal"); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("signal %S occurred\n"), signum)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("signal %S occurred\n"), signum)); // While FreeBSD 5.X has a siginfo_t struct with a si_addr field, // it does not define SEGV_MAPERR. @@ -162,12 +162,12 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (siginfo != 0) { - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) si_signo = %d, si_code = %d, addr = %u\n"), siginfo->si_signo, siginfo->si_code, siginfo->si_addr)); size_t counter; if (this->in_use (offset, counter) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("in_use"))); + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("in_use"))); #if !defined(_UNICOS) else if (!(siginfo->si_code == SEGV_MAPERR && siginfo->si_addr < (((char *) this->base_addr_) + offset) @@ -200,8 +200,8 @@ ACE_Shared_Memory_Pool::handle_signal (int , siginfo_t *siginfo, ucontext_t *) if (this->find_seg ((const void *)siginfo->si_addr, offset, counter) == -1) #endif /* ! _UNICOS */ ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("in_use")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("in_use")), -1); void *address = (void *) (((char *) this->base_addr_) + offset); @@ -275,8 +275,8 @@ ACE_Shared_Memory_Pool::ACE_Shared_Memory_Pool ( if (this->signal_handler_.register_handler (SIGSEGV, this) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Sig_Handler::register_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Sig_Handler::register_handler"))); } ACE_Shared_Memory_Pool::~ACE_Shared_Memory_Pool (void) @@ -293,14 +293,14 @@ ACE_Shared_Memory_Pool::acquire (size_t nbytes, rounded_bytes = this->round_up (nbytes); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquiring more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); ACE_OFF_T offset; if (this->commit_backing_store_name (rounded_bytes, offset) == -1) return 0; - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) acquired more chunks, nbytes = %d, rounded_bytes = %d\n"), nbytes, rounded_bytes)); return ((char *) this->base_addr_) + offset; } @@ -328,8 +328,8 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, { if (errno != EEXIST) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("shmget")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("shmget")), 0); first_time = 0; @@ -337,8 +337,8 @@ ACE_Shared_Memory_Pool::init_acquire (size_t nbytes, if (shmid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) %p\n"), - ACE_LIB_TEXT ("shmget")), + ACE_TEXT ("(%P|%t) %p\n"), + ACE_TEXT ("shmget")), 0); // This implementation doesn't care if we don't get the key we diff --git a/ACE/ace/Singleton.cpp b/ACE/ace/Singleton.cpp index fa3c00993b0..b59213eaf1b 100644 --- a/ACE/ace/Singleton.cpp +++ b/ACE/ace/Singleton.cpp @@ -32,7 +32,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -128,7 +128,7 @@ ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Unmanaged_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -218,7 +218,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -306,7 +306,7 @@ ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_Unmanaged_TSS_Singleton<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ @@ -412,7 +412,7 @@ ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump (void) ACE_TRACE ("ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::dump"); #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("instance_ = %x"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("instance_ = %x"), ACE_DLL_Singleton_T<TYPE, ACE_LOCK>::instance_i ())); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 70a02e8d67b..3046cfc1a50 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -256,8 +256,8 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (s == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::socket")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::socket")), -1); struct ifconf ifc; @@ -270,9 +270,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, // techniques if (ACE_OS::ioctl (s, SIOCGIFCONF_CMD, (char *) &ifc) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT ("ioctl (get interface configuration)")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT ("ioctl (get interface configuration)")), -1); struct ifreq *ifr = ifc.ifc_req; @@ -340,9 +340,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ifr->ifr_addr.sa_family != AF_INET) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT ("Not AF_INET"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT ("Not AF_INET"))); continue; } @@ -352,18 +352,18 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, if (ACE_OS::ioctl (s, SIOCGIFFLAGS, (char *) &flags) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT (" ioctl (get interface flags)"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT (" ioctl (get interface flags)"))); continue; } if (ACE_BIT_DISABLED (flags.ifr_flags, IFF_UP)) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT ("Network interface is not up"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT ("Network interface is not up"))); continue; } @@ -376,9 +376,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, SIOCGIFBRDADDR, (char *) &if_req) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT ("ioctl (get broadaddr)"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT ("ioctl (get broadaddr)"))); else { ACE_OS::memcpy (&ip_addr, @@ -398,9 +398,9 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr, } else ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_bcast_addr:") - ACE_LIB_TEXT ("Broadcast is not enable for this interface."))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_bcast_addr:") + ACE_TEXT ("Broadcast is not enable for this interface."))); if (handle == ACE_INVALID_HANDLE) ACE_OS::close (s); @@ -915,8 +915,8 @@ get_ip_interfaces_hpux (size_t &count, if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces:open")), -1); int result = 0; @@ -979,9 +979,9 @@ get_ip_interfaces_hpux (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces:") - ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces:") + ACE_TEXT ("ioctl - SIOCGIFCONF failed")), -1); } @@ -1044,9 +1044,9 @@ get_ip_interfaces_hpux (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces:") - ACE_LIB_TEXT ("ioctl - SIOCGLIFCONF failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces:") + ACE_TEXT ("ioctl - SIOCGLIFCONF failed")), -1); } @@ -1083,8 +1083,8 @@ get_ip_interfaces_aix (size_t &count, if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces_aix:")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces_aix:")), -1); if (ACE_OS::ioctl (handle, @@ -1093,8 +1093,8 @@ get_ip_interfaces_aix (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("get ifconf size")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("get ifconf size")), -1); } @@ -1107,8 +1107,8 @@ get_ip_interfaces_aix (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("get ifconf")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("get ifconf")), -1); } @@ -1200,8 +1200,8 @@ get_ip_interfaces_vxworks_lt600 (size_t &count, else { ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE::get_ip_interface failed\n") - ACE_LIB_TEXT ("Couldnt get the IP Address\n")), + ACE_TEXT ("ACE::get_ip_interface failed\n") + ACE_TEXT ("Couldnt get the IP Address\n")), -1); } ++count; @@ -1243,8 +1243,8 @@ ACE::get_ip_interfaces (size_t &count, if (handle == ACE_INVALID_HANDLE) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces:open")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces:open")), -1); size_t num_ifs, num_ifs_found; @@ -1291,9 +1291,9 @@ ACE::get_ip_interfaces (size_t &count, { ACE_OS::close (handle); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::get_ip_interfaces:") - ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::get_ip_interfaces:") + ACE_TEXT ("ioctl - SIOCGIFCONF failed")), -1); } @@ -1395,7 +1395,7 @@ ACE::get_ip_interfaces (size_t &count, hints.ai_flags = AI_NUMERICHOST; hints.ai_family = AF_INET6; - if ((fp = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/net/if_inet6"), ACE_LIB_TEXT ("r"))) != 0) + if ((fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/if_inet6"), ACE_TEXT ("r"))) != 0) { while (fscanf (fp, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %*02x %*02x %*02x %*8s\n", @@ -1460,9 +1460,9 @@ ACE::count_interfaces (ACE_HANDLE handle, # endif /* SIOCGLIFNUM */ if (ACE_OS::ioctl (handle, cmd, (caddr_t)&if_num) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::count_interfaces:") - ACE_LIB_TEXT ("ioctl - SIOCGLIFNUM failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::count_interfaces:") + ACE_TEXT ("ioctl - SIOCGLIFNUM failed")), -1); # if defined (SIOCGLIFNUM) how_many = if_num.lifn_count; @@ -1506,9 +1506,9 @@ return 0; { ACE_OS::free (ifcfg.ifc_req); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE::count_interfaces:") - ACE_LIB_TEXT ("ioctl - SIOCGIFCONF failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE::count_interfaces:") + ACE_TEXT ("ioctl - SIOCGIFCONF failed")), -1); } @@ -1546,7 +1546,7 @@ return 0; # if defined (ACE_HAS_IPV6) FILE* fp = 0; - if ((fp = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/net/if_inet6"), ACE_LIB_TEXT ("r"))) != 0) + if ((fp = ACE_OS::fopen (ACE_TEXT ("/proc/net/if_inet6"), ACE_TEXT ("r"))) != 0) { // Scan the lines according to the expected format but don't really read any input while (fscanf (fp, "%*32s %*02x %*02x %*02x %*02x %*8s\n") != EOF) diff --git a/ACE/ace/Stats.cpp b/ACE/ace/Stats.cpp index 4d71057f364..57f20799cc4 100644 --- a/ACE/ace/Stats.cpp +++ b/ACE/ace/Stats.cpp @@ -226,9 +226,9 @@ ACE_Stats::print_summary (const u_int precision, // Build a format string, in case the C library doesn't support %*u. ACE_TCHAR format[32]; if (tmp_precision == 0) - ACE_OS::sprintf (format, ACE_LIB_TEXT ("%%%d"), tmp_precision); + ACE_OS::sprintf (format, ACE_TEXT ("%%%d"), tmp_precision); else - ACE_OS::sprintf (format, ACE_LIB_TEXT ("%%d.%%0%du"), tmp_precision); + ACE_OS::sprintf (format, ACE_TEXT ("%%d.%%0%du"), tmp_precision); ACE_Stats_Value u (tmp_precision); ((ACE_Stats *) this)->mean (u, scale_factor); @@ -265,8 +265,8 @@ ACE_Stats::print_summary (const u_int precision, if (success == 1) { - ACE_OS::fprintf (file, ACE_LIB_TEXT ("samples: %u (%s - %s); mean: ") - ACE_LIB_TEXT ("%s; std dev: %s\n"), + ACE_OS::fprintf (file, ACE_TEXT ("samples: %u (%s - %s); mean: ") + ACE_TEXT ("%s; std dev: %s\n"), samples (), min_string, max_string, mean_string, std_dev_string); return 0; @@ -275,12 +275,12 @@ ACE_Stats::print_summary (const u_int precision, { #if !defined (ACE_HAS_WINCE) ACE_OS::fprintf (file, - ACE_LIB_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), + ACE_TEXT ("ACE_Stats::print_summary: OVERFLOW: %s\n"), ACE_OS::strerror (overflow_)); #else // WinCE doesn't have strerror ;( ACE_OS::fprintf (file, - ACE_LIB_TEXT ("ACE_Stats::print_summary: OVERFLOW\n")); + ACE_TEXT ("ACE_Stats::print_summary: OVERFLOW\n")); #endif /* ACE_HAS_WINCE */ return -1; } diff --git a/ACE/ace/Stats.inl b/ACE/ace/Stats.inl index 5fecfde1de8..621dd16841e 100644 --- a/ACE/ace/Stats.inl +++ b/ACE/ace/Stats.inl @@ -60,7 +60,7 @@ ACE_Stats_Value::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"), + ACE_TEXT ("precision: %u digits; whole: %u, fractional: %u\n"), precision_, whole_, fractional_)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp index 0eadf2ce616..3f5fc469991 100644 --- a/ACE/ace/Strategies_T.cpp +++ b/ACE/ace/Strategies_T.cpp @@ -273,7 +273,7 @@ ACE_Thread_Strategy<SVC_HANDLER>::open (ACE_Thread_Manager *thr_mgr, // Must have a thread manager! if (this->thr_mgr_ == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("error: must have a non-NULL thread manager\n")), + ACE_TEXT ("error: must have a non-NULL thread manager\n")), -1); else return 0; @@ -326,8 +326,8 @@ ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::ACE_Accept_Strategy if (this->open (local_addr, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("open"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("open"))); } template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int @@ -431,7 +431,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle ACE_TRACE ("ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler"); // If <flags_> is non-0 then we won't create zombies. - switch (ACE::fork (ACE_LIB_TEXT ("child"), this->flags_)) + switch (ACE::fork (ACE_TEXT ("child"), this->flags_)) { case -1: { @@ -439,8 +439,8 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle svc_handler->destroy (); } ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("fork")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("fork")), -1); /* NOTREACHED */ case 0: // In child process. @@ -497,8 +497,8 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::ACE_Cache con_s, rec_s) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Cached_Connect_Strategy::ACE_Cached_Connect_Strategy"))); } template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> diff --git a/ACE/ace/Strategies_T.inl b/ACE/ace/Strategies_T.inl index a6a6d1dfd1a..bf5f43fe4b2 100644 --- a/ACE/ace/Strategies_T.inl +++ b/ACE/ace/Strategies_T.inl @@ -13,8 +13,8 @@ ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy (SVC_HANDLER *sh, ACE_TRACE ("ACE_Singleton_Strategy<SVC_HANDLER>::ACE_Singleton_Strategy"); if (this->open (sh, tm) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Singleton_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Singleton_Strategy"))); } template <class SVC_HANDLER> ACE_INLINE int @@ -34,8 +34,8 @@ ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy (ACE_Thread_Manager *t ACE_TRACE ("ACE_Creation_Strategy<SVC_HANDLER>::ACE_Creation_Strategy"); if (this->open (thr_mgr, reactor) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Creation_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Creation_Strategy"))); } template <class SVC_HANDLER> ACE_INLINE @@ -52,8 +52,8 @@ ACE_DLL_Strategy<SVC_HANDLER>::ACE_DLL_Strategy (const ACE_TCHAR dll_name[], svc_rep, thr_mgr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("open"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("open"))); } template <class SVC_HANDLER> ACE_INLINE @@ -80,8 +80,8 @@ ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy (ACE_Reactor *reactor, mask, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Reactive_Strategy<SVC_HANDLER>::ACE_Reactive_Strategy"))); } template <class SVC_HANDLER> ACE_INLINE @@ -106,8 +106,8 @@ ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy (ACE_Thread_Manager *thr_m n_threads, flags) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread_Strategy<SVC_HANDLER>::ACE_Thread_Strategy"))); } template <class SVC_HANDLER> ACE_INLINE @@ -145,8 +145,8 @@ ACE_Process_Strategy<SVC_HANDLER>::ACE_Process_Strategy (size_t n_processes, reactor, avoid_zombies) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Process_Strategy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Process_Strategy"))); } template <class SVC_HANDLER> ACE_INLINE diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 56fa5a91aeb..a83e6cbd942 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -29,18 +29,18 @@ ACE_Stream<ACE_SYNCH_USE>::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- module links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- module links --------\n"))); for (ACE_Module<ACE_SYNCH_USE> *mp = this->stream_head_; ; mp = mp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("module name = %s\n"), mp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("module name = %s\n"), mp->name ())); if (mp == this->stream_tail_) break; } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- writer links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- writer links --------\n"))); ACE_Task<ACE_SYNCH_USE> *tp; @@ -48,21 +48,21 @@ ACE_Stream<ACE_SYNCH_USE>::dump (void) const ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("writer queue name = %s\n"), tp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("writer queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); if (tp == this->stream_tail_->writer () || (this->linked_us_ && tp == this->linked_us_->stream_head_->reader ())) break; } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------- reader links --------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------- reader links --------\n"))); for (tp = this->stream_tail_->reader (); ; tp = tp->next ()) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("reader queue name = %s\n"), tp->name ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reader queue name = %s\n"), tp->name ())); tp->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("-------\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("-------\n"))); if (tp == this->stream_head_->reader () || (this->linked_us_ && tp == this->linked_us_->stream_head_->writer ())) @@ -337,7 +337,7 @@ ACE_Stream<ACE_SYNCH_USE>::open (void *a, ACE_Stream_Head<ACE_SYNCH_USE>, -1); ACE_NEW_RETURN (head, - ACE_Module<ACE_SYNCH_USE> (ACE_LIB_TEXT ("ACE_Stream_Head"), + ACE_Module<ACE_SYNCH_USE> (ACE_TEXT ("ACE_Stream_Head"), h1, h2, a, M_DELETE), @@ -353,7 +353,7 @@ ACE_Stream<ACE_SYNCH_USE>::open (void *a, ACE_Stream_Tail<ACE_SYNCH_USE>, -1); ACE_NEW_RETURN (tail, - ACE_Module<ACE_SYNCH_USE> (ACE_LIB_TEXT ("ACE_Stream_Tail"), + ACE_Module<ACE_SYNCH_USE> (ACE_TEXT ("ACE_Stream_Tail"), t1, t2, a, M_DELETE), @@ -594,7 +594,7 @@ ACE_Stream<ACE_SYNCH_USE>::ACE_Stream (void * a, ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::ACE_Stream"); if (this->open (a, head, tail) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_Stream<ACE_SYNCH_USE>::open (%s, %s)\n"), + ACE_TEXT ("ACE_Stream<ACE_SYNCH_USE>::open (%s, %s)\n"), head->name (), tail->name ())); } diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index a211d95ef42..7d26b8cd849 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -1264,7 +1264,7 @@ ace_yyreduce: || st->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("dynamic initialization failed for Module %s\n"), + ACE_TEXT ("dynamic initialization failed for Module %s\n"), svc_type->name ())); ACE_SVC_CONF_PARAM->yyerrno++; } @@ -1283,7 +1283,7 @@ ace_yyreduce: if (((ACE_Stream_Type *) sn->record (ACE_SVC_CONF_PARAM->config)->type ())->push (mt) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Problem with static\n"))); + ACE_TEXT ("Problem with static\n"))); ACE_SVC_CONF_PARAM->yyerrno++; } ;} @@ -1327,7 +1327,7 @@ ace_yyreduce: if (!st || (mt != 0 && st->remove (mt) == -1)) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), + ACE_TEXT ("cannot remove Module_Type %s from STREAM_Type %s\n"), module->name (), stream->name ())); ACE_SVC_CONF_PARAM->yyerrno++; @@ -1654,7 +1654,7 @@ ace_yyerror (int ace_yyerrno, int ace_yylineno, char const *s) #endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), + ACE_TEXT ("ACE (%P|%t) [error %d] on line %d: %s\n"), ace_yyerrno, ace_yylineno, ACE_TEXT_CHAR_TO_TCHAR (s))); @@ -1678,10 +1678,10 @@ ace_get_module (ACE_Service_Type const * sr, if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s ") - ACE_LIB_TEXT ("in STREAM_Type %s\n"), + ACE_TEXT ("cannot locate Module_Type %s ") + ACE_TEXT ("in STREAM_Type %s\n"), svc_name, - (sr ? sr->name () : ACE_LIB_TEXT ("(nil)")))); + (sr ? sr->name () : ACE_TEXT ("(nil)")))); ++ace_yyerrno; } @@ -1702,14 +1702,14 @@ ace_get_module (ACE_Service_Type const * sr, static_cast <ACE_Module_Type const *> (sv->type ()); ACE_TCHAR const * const module_type_name = - (mt ? mt->name () : ACE_LIB_TEXT ("(nil)")); + (mt ? mt->name () : ACE_TEXT ("(nil)")); if (sr == 0 || st == 0 || mt == 0) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), + ACE_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"), module_type_name, - (sr ? sr->name () : ACE_LIB_TEXT ("(nil)")))); + (sr ? sr->name () : ACE_TEXT ("(nil)")))); ++ace_yyerrno; } @@ -1721,7 +1721,7 @@ ace_get_module (ACE_Service_Type const * sr, if (mp && ACE_OS::strcmp (mp->name (), module_type_name) != 0) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), + ACE_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"), module_type_name, mp->name ())); mp->name (module_type_name); @@ -1740,7 +1740,7 @@ main (int argc, char *argv[]) // Try to reopen any filename argument to use ACE_YYIN. if (argc > 1 && (ace_yyin = freopen (argv[1], "r", stdin)) == 0) - (void) ACE_OS::ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1); + (void) ACE_OS::ACE_OS::fprintf (stderr, ACE_TEXT ("usage: %s [file]\n"), argv[0]), ACE_OS::exit (1); return ::ace_yyparse (¶m); } diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp index de3678fee4d..7941c34238c 100644 --- a/ACE/ace/Svc_Handler.cpp +++ b/ACE/ace/Svc_Handler.cpp @@ -170,16 +170,16 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) if (this->peer_.get_remote_addr (client_addr) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("get_remote_addr")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("get_remote_addr")), -1); else if (client_addr.addr_to_string (buf, sizeof buf) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("can't obtain peer's address")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("can't obtain peer's address")), -1); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("connected to %s on fd %d\n"), + ACE_TEXT ("connected to %s on fd %d\n"), buf, this->peer_.get_handle ())); #endif /* ACE_DEBUGGING */ @@ -188,8 +188,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *) (this, ACE_Event_Handler::READ_MASK) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("unable to register client handler")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("unable to register client handler")), -1); return 0; } diff --git a/ACE/ace/System_Time.cpp b/ACE/ace/System_Time.cpp index ae5a9f905ab..d1ae525b8d6 100644 --- a/ACE/ace/System_Time.cpp +++ b/ACE/ace/System_Time.cpp @@ -32,13 +32,13 @@ ACE_System_Time::ACE_System_Time (const ACE_TCHAR *poolname) // -17 for ace-malloc-XXXXXX { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Temporary path too long, ") - ACE_LIB_TEXT ("defaulting to current directory\n"))); + ACE_TEXT ("Temporary path too long, ") + ACE_TEXT ("defaulting to current directory\n"))); this->poolname_[0] = 0; } // Add the filename to the end - ACE_OS::strcat (this->poolname_, ACE_LIB_TEXT ("ace-malloc-XXXXXX")); + ACE_OS::strcat (this->poolname_, ACE_TEXT ("ace-malloc-XXXXXX")); #endif /* ACE_DEFAULT_BACKING_STORE */ } diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index c53ed5a7e4e..7dde750931c 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -86,8 +86,8 @@ ACE_TLI::ACE_TLI (const char device[], int oflag, struct t_info *info) ACE_TRACE ("ACE_TLI::ACE_TLI"); if (this->open (device, oflag, info) == ACE_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_TLI::ACE_TLI"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_TLI::ACE_TLI"))); } int diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index 34890b40de6..b6820c5db4e 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -401,8 +401,8 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap, back, dev) == ACE_INVALID_HANDLE) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor"))); } int diff --git a/ACE/ace/TLI_Connector.inl b/ACE/ace/TLI_Connector.inl index f2a29f122c3..8dc40b1eaa6 100644 --- a/ACE/ace/TLI_Connector.inl +++ b/ACE/ace/TLI_Connector.inl @@ -33,8 +33,8 @@ ACE_TLI_Connector::ACE_TLI_Connector (ACE_TLI_Stream &new_stream, opt) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } ACE_INLINE diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp index e6651f47da0..ccc8c5383c6 100644 --- a/ACE/ace/TP_Reactor.cpp +++ b/ACE/ace/TP_Reactor.cpp @@ -629,7 +629,7 @@ ACE_TP_Reactor::post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info, // Only remove or resume the event handler used during the // upcall. if (eh == dispatch_info.event_handler_) - { + { if (status < 0) { result = @@ -672,8 +672,8 @@ ACE_TP_Reactor::notify_handle (ACE_HANDLE, ACE_EH_PTMF) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_TP_Reactor::notify_handle: ") - ACE_LIB_TEXT ("Wrong version of notify_handle() got called \n"))); + ACE_TEXT ("ACE_TP_Reactor::notify_handle: ") + ACE_TEXT ("Wrong version of notify_handle() got called \n"))); ACE_ASSERT (eh == 0); ACE_UNUSED_ARG (eh); diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 905bcd23202..d6fd684f8a5 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -71,9 +71,9 @@ ACE_TSS<TYPE>::dump (void) const #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->keylock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d\n"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nonce_ = %d"), this->once_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nonce_ = %d"), this->once_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ #endif /* ACE_HAS_DUMP */ @@ -140,8 +140,8 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) // What should we do if this call fails?! #if defined (ACE_HAS_WINCE) ::MessageBox (0, - ACE_LIB_TEXT ("ACE_Thread::keycreate() failed!"), - ACE_LIB_TEXT ("ACE_TSS::ACE_TSS"), + ACE_TEXT ("ACE_Thread::keycreate() failed!"), + ACE_TEXT ("ACE_TSS::ACE_TSS"), MB_OK); #else ACE_OS::fprintf (stderr, @@ -164,15 +164,15 @@ ACE_TSS<TYPE>::ACE_TSS (TYPE *ts_obj) { delete tss_adapter; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread::setspecific() failed!"))); } #else if (ACE_Thread::setspecific (this->key_, (void *) ts_obj) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread::setspecific() failed!"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread::setspecific() failed!"))); #endif /* ACE_HAS_THR_C_DEST */ } } @@ -357,8 +357,8 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const // ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("key_ = %d"), this->key_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d"), this->key_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Task_Ex_T.cpp b/ACE/ace/Task_Ex_T.cpp index 0c5871657dd..727452f8546 100644 --- a/ACE/ace/Task_Ex_T.cpp +++ b/ACE/ace/Task_Ex_T.cpp @@ -25,14 +25,14 @@ ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_count_ = %d"), this->thr_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->lock_.dump (); #endif /* ACE_MT_SAFE */ diff --git a/ACE/ace/Task_T.cpp b/ACE/ace/Task_T.cpp index f0c97e74193..c54449276d1 100644 --- a/ACE/ace/Task_T.cpp +++ b/ACE/ace/Task_T.cpp @@ -24,14 +24,14 @@ ACE_Task<ACE_SYNCH_USE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Task<ACE_SYNCH_USE>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_)); this->msg_queue_->dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags = %x"), this->flags_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmod_ = %x"), this->mod_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_count_ = %d"), this->thr_count_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("delete_msg_queue_ = %d\n"), this->delete_msg_queue_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags = %x"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmod_ = %x"), this->mod_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_count_ = %d"), this->thr_count_)); #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) this->lock_.dump (); #endif /* ACE_MT_SAFE */ diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index 8d8ca9dc72f..8f00bf22abe 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -74,8 +74,8 @@ ACE_Thread_Manager::dump (void) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ())); for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); !iter.done (); @@ -248,12 +248,12 @@ ACE_Thread_Descriptor::dump (void) const ACE_TRACE ("ACE_Thread_Descriptor::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_id_ = %d"), this->thr_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthr_state_ = %d"), this->thr_state_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncleanup_info_.cleanup_hook_ = %x"), this->cleanup_info_.cleanup_hook_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nflags_ = %x\n"), this->flags_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncleanup_info_.cleanup_hook_ = %x"), this->cleanup_info_.cleanup_hook_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Thread_Mutex.cpp b/ACE/ace/Thread_Mutex.cpp index 7ec3b8921ac..66da2cb48fd 100644 --- a/ACE/ace/Thread_Mutex.cpp +++ b/ACE/ace/Thread_Mutex.cpp @@ -32,7 +32,7 @@ ACE_Thread_Mutex::dump (void) const // ACE_TRACE ("ACE_Thread_Mutex::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -53,8 +53,8 @@ ACE_Thread_Mutex::ACE_Thread_Mutex (const ACE_TCHAR *name, ACE_mutexattr_t *arg) name, arg) != 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Thread_Mutex::ACE_Thread_Mutex"))); } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp index e2f52e0cef7..d2d346eafd4 100644 --- a/ACE/ace/Throughput_Stats.cpp +++ b/ACE/ace/Throughput_Stats.cpp @@ -112,7 +112,7 @@ ACE_Throughput_Stats::dump_results (const ACE_TCHAR* msg, if (this->samples_count () == 0u) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s : no data collected\n"), msg)); + ACE_TEXT ("%s : no data collected\n"), msg)); return; } @@ -189,7 +189,7 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg, const double t_avg = samples_count / seconds; ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s throughput: %.2f (events/second)\n"), + ACE_TEXT ("%s throughput: %.2f (events/second)\n"), msg, t_avg)); #else ACE_UNUSED_ARG (msg); diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 52d85c78ae8..33ebdd8fa7f 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -159,8 +159,8 @@ ACE_Time_Value::dump (void) const // ACE_OS_TRACE ("ACE_Time_Value::dump"); #if 0 ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* 0 */ #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Timeprobe_T.cpp b/ACE/ace/Timeprobe_T.cpp index 6b5348770c4..39f1bfc804e 100644 --- a/ACE/ace/Timeprobe_T.cpp +++ b/ACE/ace/Timeprobe_T.cpp @@ -65,7 +65,7 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::ACE_Timeprobe_Ex (const ACE_Timeprobe_Ex< // ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_NOTSUP: %N, line %l\n"))); + ACE_TEXT ("ACE_NOTSUP: %N, line %l\n"))); errno = ENOTSUP; } @@ -290,8 +290,8 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_times (void) time_difference)); j = i; - i = (i + 1) % this->max_size_; - } + i = (i + 1) % this->max_size_; + } while (i != this->current_size_); static bool inversion_warning_printed = false; @@ -345,14 +345,14 @@ ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::print_absolute_times (void) // Modulus increment: loops around at the end. i = (i + 1) % this->max_size_; - } + } while (i != this->current_size_); } template <class ACE_LOCK, class ALLOCATOR> const char * ACE_Timeprobe_Ex<ACE_LOCK, ALLOCATOR>::find_description_i (u_long i) { - if (this->timeprobes_[i].event_type_ == ACE_timeprobe_t::STRING) + if (this->timeprobes_[i].event_type_ == ACE_timeprobe_t::STRING) return this->timeprobes_[i].event_.event_description_; else { diff --git a/ACE/ace/Timer_Hash_T.cpp b/ACE/ace/Timer_Hash_T.cpp index 45c1fe5c4b2..ee312e59547 100644 --- a/ACE/ace/Timer_Hash_T.cpp +++ b/ACE/ace/Timer_Hash_T.cpp @@ -351,14 +351,14 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Hash_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntable_size_ = %d"), this->table_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntable_size_ = %d"), this->table_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nearliest_position_ = %d"), this->earliest_position_)); for (size_t i = 0; i < this->table_size_; ++i) if (!this->table_[i]->is_empty ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nBucket %d contains nodes"), i)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nBucket %d contains nodes"), i)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index 9570380d145..5746b08b837 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -343,29 +343,29 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_TRACE ("ACE_Timer_Heap_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmax_size_ = %d"), this->max_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d"), this->cur_size_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nids_curr_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmax_size_ = %d"), this->max_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_limbo_= %d"), this->cur_limbo_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nids_curr_ = %d"), this->timer_ids_curr_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nmin_free_ = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nmin_free_ = %d"), this->timer_ids_min_free_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nheap_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nheap_ = \n"))); for (size_t i = 0; i < this->cur_size_; i++) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%d\n"), + ACE_TEXT ("%d\n"), i)); this->heap_[i]->dump (); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_ids_ = \n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_ids_ = \n"))); for (size_t j = 0; j < this->max_size_; j++) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%d\t%d\n"), + ACE_TEXT ("%d\t%d\n"), j, this->timer_ids_[j])); diff --git a/ACE/ace/Timer_List_T.cpp b/ACE/ace/Timer_List_T.cpp index 60a116bb835..0af2bb67526 100644 --- a/ACE/ace/Timer_List_T.cpp +++ b/ACE/ace/Timer_List_T.cpp @@ -166,7 +166,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const } } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nsize_ = %d"), count)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nsize_ = %d"), count)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Queue_Adapters.cpp b/ACE/ace/Timer_Queue_Adapters.cpp index 0b4042d1cd3..8f76209147b 100644 --- a/ACE/ace/Timer_Queue_Adapters.cpp +++ b/ACE/ace/Timer_Queue_Adapters.cpp @@ -86,8 +86,8 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, if (tid == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("schedule_timer")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("schedule_timer")), -1); if (this->schedule_ualarm () == -1) @@ -112,8 +112,8 @@ ACE_Async_Timer_Queue_Adapter<TQ>::ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *m if (this->sig_handler_.register_handler (SIGALRM, this, &sa) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("register_handler"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("register_handler"))); } // This is the signal handler function for the asynchronous timer @@ -272,7 +272,7 @@ ACE_Thread_Timer_Queue_Adapter<TQ>::svc (void) // use ACE_OS::gettimeofday() to convert the tv to the // absolute time. ACE_Time_Value const tv = ACE_OS::gettimeofday () + (tv_earl - tv_curr); - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting until %u.%3.3u secs\n"), + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting until %u.%3.3u secs\n"), // tv.sec(), tv.msec())); this->condition_.wait (&tv); } diff --git a/ACE/ace/Timer_Queue_T.cpp b/ACE/ace/Timer_Queue_T.cpp index 6879eea9ac8..b7cf0bb40dd 100644 --- a/ACE/ace/Timer_Queue_T.cpp +++ b/ACE/ace/Timer_Queue_T.cpp @@ -40,12 +40,12 @@ ACE_Timer_Node_T<TYPE>::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Timer_Node_T::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nact_ = %x"), this->act_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nact_ = %x"), this->act_)); this->timer_value_.dump (); this->interval_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nprev_ = %x"), this->prev_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnext_ = %x"), this->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nprev_ = %x"), this->prev_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnext_ = %x"), this->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ntimer_id_ = %d\n"), this->timer_id_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 149de55c520..2c075768e60 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -694,15 +694,15 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nspoke_count_ = %d"), this->spoke_count_)); + ACE_TEXT ("\nspoke_count_ = %d"), this->spoke_count_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); + ACE_TEXT ("\nresolution_ = %d"), 1 << this->res_bits_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\nwheel_ = \n"))); + ACE_TEXT ("\nwheel_ = \n"))); for (u_int i = 0; i < this->spoke_count_; ++i) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%d\n"), i)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%d\n"), i)); ACE_Timer_Node_T<TYPE>* root = this->spokes_[i]; for (ACE_Timer_Node_T<TYPE>* n = root->get_next (); n != root; diff --git a/ACE/ace/Token.cpp b/ACE/ace/Token.cpp index f134bd028bf..85fa9cf5b66 100644 --- a/ACE/ace/Token.cpp +++ b/ACE/ace/Token.cpp @@ -30,13 +30,13 @@ ACE_Token::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nthread = %d"), ACE_Thread::self ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthread = %d"), ACE_Thread::self ())); // @@ Is there a portable way to do this? // ACE_DEBUG ((LM_DEBUG, "\nowner_ = %d", (long) this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nowner_ addr = %x"), &this->owner_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nwaiters_ = %d"), this->waiters_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nin_use_ = %d"), this->in_use_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nnesting level = %d"), this->nesting_level_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nowner_ addr = %x"), &this->owner_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nwaiters_ = %d"), this->waiters_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nin_use_ = %d"), this->in_use_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nnesting level = %d"), this->nesting_level_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index 97c919565b9..8ed4fca1d39 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -20,7 +20,7 @@ ACE_Token_Collection::ACE_Token_Collection (bool debug, ACE_TRACE ("ACE_Token_Collection::ACE_Token_Collection"); if (name == 0) - name = ACE_LIB_TEXT ("no name"); + name = ACE_TEXT ("no name"); ACE_OS::strsncpy (this->name_, const_cast<ACE_TCHAR *> (name), @@ -43,7 +43,7 @@ ACE_Token_Collection::insert (ACE_Token_Proxy &new_token) ACE_Token_Proxy *temp = new_token.clone (); if (collection_.bind (name, temp) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("bind failed\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("bind failed\n")), -1); return 0; } @@ -88,7 +88,7 @@ ACE_Token_Collection::acquire (int notify, { if (debug_) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("collection acquiring %s\n"), + ACE_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); if (temp->int_id_->acquire (notify, sleep_hook, @@ -152,7 +152,7 @@ ACE_Token_Collection::tryacquire (void (*sleep_hook)(void *)) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection acquiring %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection acquiring %s\n"), temp->int_id_->name ())); // We will fail if _any_ token is not free. if (temp->int_id_->tryacquire (sleep_hook) == -1) @@ -175,7 +175,7 @@ ACE_Token_Collection::renew (int requeue_position, iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection renewing %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection renewing %s\n"), temp->int_id_->name ())); if (temp->int_id_->renew (requeue_position, options) == -1) return -1; @@ -198,8 +198,8 @@ ACE_Token_Collection::renew (const ACE_TCHAR *token_name, // Did we find it? if (result == -1) - ACE_ERROR_RETURN ((LM_DEBUG, ACE_LIB_TEXT ("%p %s\n"), - ACE_LIB_TEXT ("not in collection "), + ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("%p %s\n"), + ACE_TEXT ("not in collection "), token_name), -1); // perform the operation return temp->renew (requeue_position, options); @@ -217,7 +217,7 @@ ACE_Token_Collection::release (ACE_Synch_Options &) iterator.advance ()) { if (debug_) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection releasing %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection releasing %s\n"), temp->int_id_->name ())); temp->int_id_->release (); } @@ -279,11 +279,11 @@ ACE_Token_Collection::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Collection::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Collection::dump:\n") - ACE_LIB_TEXT (" debug_ = %d\n"), debug_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Collection::dump:\n") + ACE_TEXT (" debug_ = %d\n"), debug_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("base:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("base:\n"))); ACE_Token_Proxy::dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index 1c7ca9677d3..fe411815dee 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -142,9 +142,9 @@ ACE_Token_Invariant_Manager::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Invariant_Manager::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("mutex_collection_:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("mutex_collection_:\n"))); mutex_collection_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("rwlock_collection_:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("rwlock_collection_:\n"))); rwlock_collection_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ @@ -269,7 +269,7 @@ ACE_Mutex_Invariants::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Mutex_Invariants::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("owners_ = %d\n"), owners_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("owners_ = %d\n"), owners_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ } @@ -344,7 +344,7 @@ ACE_RWLock_Invariants::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_RWLock_Invariants::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("writers_ = %d readers_ = %d\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("writers_ = %d readers_ = %d\n"), writers_, readers_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Token_Manager.cpp b/ACE/ace/Token_Manager.cpp index a68ac717ebf..0bc2a276494 100644 --- a/ACE/ace/Token_Manager.cpp +++ b/ACE/ace/Token_Manager.cpp @@ -154,8 +154,8 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) // The caller is an owner, so we have a deadlock situation. if (debug_) { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) Deadlock detected.\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Deadlock detected.\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s owns %s and is waiting for %s.\n"), proxy->client_id (), token->name (), proxy->token_->name ())); @@ -177,7 +177,7 @@ ACE_Token_Manager::check_deadlock (ACE_Tokens *token, ACE_Token_Proxy *proxy) if (debug_) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("%s owns %s and is waiting for %s.\n"), + ACE_TEXT ("%s owns %s and is waiting for %s.\n"), e->client_id (), token->name (), twf->name ())); @@ -232,7 +232,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token) // we did not find one in the collection { errno = ENOENT; - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Token Manager could not release %s:%d\n"), + ACE_ERROR ((LM_ERROR, ACE_TEXT ("Token Manager could not release %s:%d\n"), token->name (), token->type ())); // @@ bad } @@ -259,10 +259,10 @@ ACE_Token_Manager::dump (void) const #if defined (ACE_HAS_DUMP) ACE_TRACE ("ACE_Token_Manager::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACE_Token_Manager::dump:\n"))); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("lock_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACE_Token_Manager::dump:\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("lock_\n"))); lock_.dump (); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("collection_\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("collection_\n"))); collection_.dump (); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index 802cbc5f697..24c1098238f 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -95,42 +95,42 @@ ACE_Token_Request::dump (void) const { #if defined (ACE_HAS_DUMP) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\ntoken name = %s\nclient id = %s\n"), this->length (), this->token_name (), this->client_id ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("type = "))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("type = "))); if (this->token_type () == ACE_Tokens::MUTEX) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("MUTEX\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("MUTEX\n"))); else // == ACE_Tokens::RWLOCK { if (this->proxy_type () == ACE_RW_Token::READER) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RLOCK\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RLOCK\n"))); else // == WRITER - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("WLOCK\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("WLOCK\n"))); } - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("operation = "))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("operation = "))); switch (this->operation_type ()) { case ACE_Token_Request::ACQUIRE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("ACQUIRE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ACQUIRE\n"))); break; case ACE_Token_Request::RELEASE: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RELEASE\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RELEASE\n"))); break; case ACE_Token_Request::RENEW: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("RENEW\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RENEW\n"))); break; default: - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<unknown operation type> = %d\n"), this->operation_type ())); break; } if (this->options ()[ACE_Synch_Options::USE_TIMEOUT] == 0) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("blocking forever\n"))); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("blocking forever\n"))); else { - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("waiting for %d secs and %d usecs\n"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("waiting for %d secs and %d usecs\n"), this->options ().timeout ().sec (), this->options ().timeout ().usec ())); } ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -175,9 +175,9 @@ void ACE_Token_Reply::dump (void) const { #if defined (ACE_HAS_DUMP) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("*******\nlength = %d\nerrnum = %d"), + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("*******\nlength = %d\nerrnum = %d"), this->length (), this->errnum ())); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("arg = %d"), this->arg ())); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("arg = %d"), this->arg ())); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/Token_Request_Reply.inl b/ACE/ace/Token_Request_Reply.inl index 7a62c92d7c1..36688fb8d63 100644 --- a/ACE/ace/Token_Request_Reply.inl +++ b/ACE/ace/Token_Request_Reply.inl @@ -133,7 +133,7 @@ ACE_Token_Request::token_name (const ACE_TCHAR *token_name, // Set up pointers and copy token_name and client_id into request. token_name_ = this->transfer_.data_; client_id_ = &this->token_name_[token_name_length + 1]; // Add 1 for ':'; - client_id_[-1] = ACE_LIB_TEXT (':'); // Insert the ':' before this->clientId_. + client_id_[-1] = ACE_TEXT (':'); // Insert the ':' before this->clientId_. (void) ACE_OS::memcpy (this->token_name_, token_name, diff --git a/ACE/ace/Trace.cpp b/ACE/ace/Trace.cpp index 63faa316d4e..f83e8e96511 100644 --- a/ACE/ace/Trace.cpp +++ b/ACE/ace/Trace.cpp @@ -99,9 +99,9 @@ ACE_Trace::ACE_Trace (const ACE_TCHAR *n, { lm->trace_active (1); ACE_DEBUG ((LM_TRACE, - ACE_LIB_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), + ACE_TEXT ("%*s(%t) calling %s in file `%s' on line %d\n"), ACE_Trace::nesting_indent_ * lm->inc (), - ACE_LIB_TEXT (""), + ACE_TEXT (""), this->name_, file, line)); @@ -125,9 +125,9 @@ ACE_Trace::~ACE_Trace (void) { lm->trace_active (1); ACE_DEBUG ((LM_TRACE, - ACE_LIB_TEXT ("%*s(%t) leaving %s\n"), + ACE_TEXT ("%*s(%t) leaving %s\n"), ACE_Trace::nesting_indent_ * lm->dec (), - ACE_LIB_TEXT (""), + ACE_TEXT (""), this->name_)); lm->trace_active (0); } diff --git a/ACE/ace/Trace.h b/ACE/ace/Trace.h index cee664e732a..4fdb86a3367 100644 --- a/ACE/ace/Trace.h +++ b/ACE/ace/Trace.h @@ -42,7 +42,7 @@ public: /// N, the LINE, and the ACE_FILE as the function is entered. ACE_Trace (const ACE_TCHAR *n, int line = 0, - const ACE_TCHAR *file = ACE_LIB_TEXT ("")); + const ACE_TCHAR *file = ACE_TEXT ("")); /// Perform the second part of the trace, which prints out the NAME /// as the function is exited. diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp index 4b106b4a4be..08878a8b5c5 100644 --- a/ACE/ace/UPIPE_Acceptor.cpp +++ b/ACE/ace/UPIPE_Acceptor.cpp @@ -64,8 +64,8 @@ ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, if (this->open (local_addr, reuse_addr) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_UPIPE_Acceptor"))); } int @@ -104,17 +104,17 @@ ACE_UPIPE_Acceptor::accept (ACE_UPIPE_Stream &new_stream, (char *) &remote_stream, sizeof remote_stream) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("read stream address failed"))); + ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_TEXT ("read stream address failed"))); else if (new_stream.stream_.link (remote_stream->stream_) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("link streams failed"))); + ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_TEXT ("link streams failed"))); // Send a message over the new streampipe to confirm acceptance. else if (new_stream.send (&mb_, 0) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Acceptor: %p\n"), - ACE_LIB_TEXT ("linked stream.put failed"))); + ACE_TEXT ("ACE_UPIPE_Acceptor: %p\n"), + ACE_TEXT ("linked stream.put failed"))); // Close down the new_stream at this point in order to conserve // handles. Note that we don't need the SPIPE connection diff --git a/ACE/ace/UPIPE_Connector.cpp b/ACE/ace/UPIPE_Connector.cpp index ba0b4592d2f..2af0ab5ee16 100644 --- a/ACE/ace/UPIPE_Connector.cpp +++ b/ACE/ace/UPIPE_Connector.cpp @@ -71,8 +71,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, sizeof ustream); if (result == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_LIB_TEXT ("write to pipe failed"))); + ACE_TEXT ("ACE_UPIPE_Connector %p\n"), + ACE_TEXT ("write to pipe failed"))); // Wait for confirmation of stream linking. ACE_Message_Block *mb_p = 0; @@ -84,8 +84,8 @@ ACE_UPIPE_Connector::connect (ACE_UPIPE_Stream &new_stream, // They perform different checks and cannot be merged. if (result == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_UPIPE_Connector %p\n"), - ACE_LIB_TEXT ("no confirmation from server"))); + ACE_TEXT ("ACE_UPIPE_Connector %p\n"), + ACE_TEXT ("no confirmation from server"))); else // Close down the new_stream at this point in order to // conserve handles. Note that we don't need the SPIPE diff --git a/ACE/ace/UPIPE_Connector.inl b/ACE/ace/UPIPE_Connector.inl index b45134f1067..24252234f2e 100644 --- a/ACE/ace/UPIPE_Connector.inl +++ b/ACE/ace/UPIPE_Connector.inl @@ -19,9 +19,9 @@ ACE_UPIPE_Connector::ACE_UPIPE_Connector (ACE_UPIPE_Stream &new_stream, reuse_addr, flags, perms) == -1 && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("address %s, %p\n"), + ACE_TEXT ("address %s, %p\n"), addr.get_path_name (), - ACE_LIB_TEXT ("ACE_UPIPE_Connector"))); + ACE_TEXT ("ACE_UPIPE_Connector"))); } ACE_INLINE int diff --git a/ACE/ace/Unbounded_Queue.cpp b/ACE/ace/Unbounded_Queue.cpp index f88a45ee493..96a1603952a 100644 --- a/ACE/ace/Unbounded_Queue.cpp +++ b/ACE/ace/Unbounded_Queue.cpp @@ -90,9 +90,9 @@ ACE_Unbounded_Queue<T>::dump (void) const // ACE_TRACE ("ACE_Unbounded_Queue<T>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -102,7 +102,7 @@ ACE_Unbounded_Queue<T>::dump (void) const for (ACE_Unbounded_Queue_Iterator<T> iter (*(ACE_Unbounded_Queue<T> *) this); iter.next (item) != 0; iter.advance ()) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %d\n"), count++)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %d\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/Unbounded_Set.cpp b/ACE/ace/Unbounded_Set.cpp index 0b3318456d2..0d7491c0c4d 100644 --- a/ACE/ace/Unbounded_Set.cpp +++ b/ACE/ace/Unbounded_Set.cpp @@ -65,9 +65,9 @@ ACE_Unbounded_Set<T>::dump (void) const ACE_TRACE ("ACE_Unbounded_Set<T>::dump"); ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_ = %u"), this->head_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_ = %u"), this->head_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nhead_->next_ = %u"), this->head_->next_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; #if !defined (ACE_NLOGGING) @@ -78,7 +78,7 @@ ACE_Unbounded_Set<T>::dump (void) const for (const_iterator i (this->begin ()); i != end; ++i) - ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("count = %u\n"), count++)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("count = %u\n"), count++)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 55e28594acf..726119ba307 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -30,7 +30,7 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size) { if (size > MAXIMUM_WAIT_OBJECTS) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), + ACE_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), size, MAXIMUM_WAIT_OBJECTS), -1); @@ -1002,53 +1002,53 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Max size = %d\n"), + ACE_TEXT ("Max size = %d\n"), this->max_size_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Current info table\n\n"))); + ACE_TEXT ("Current info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), + ACE_TEXT ("\tSize = %d\n"), this->max_handlep1_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tHandles to be suspended = %d\n"), + ACE_TEXT ("\tHandles to be suspended = %d\n"), this->handles_to_be_suspended_)); for (i = 0; i < this->max_handlep1_; ++i) this->current_info_[i].dump (this->current_handles_[i]); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); + ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("To-be-added info table\n\n"))); + ACE_TEXT ("To-be-added info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), + ACE_TEXT ("\tSize = %d\n"), this->handles_to_be_added_)); for (i = 0; i < this->handles_to_be_added_; ++i) this->to_be_added_info_[i].dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); + ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspended info table\n\n"))); + ACE_TEXT ("Suspended info table\n\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tSize = %d\n"), + ACE_TEXT ("\tSize = %d\n"), this->suspended_handles_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\tHandles to be resumed = %d\n"), + ACE_TEXT ("\tHandles to be resumed = %d\n"), this->handles_to_be_resumed_)); for (i = 0; i < this->suspended_handles_; ++i) this->current_suspended_info_[i].dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("\n"))); + ACE_TEXT ("\n"))); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Total handles to be deleted = %d\n"), + ACE_TEXT ("Total handles to be deleted = %d\n"), this->handles_to_be_deleted_)); ACE_DEBUG ((LM_DEBUG, @@ -1095,8 +1095,8 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh, { if (this->open (ACE_WFMO_Reactor::DEFAULT_SIZE, 0, sh, tq, 0, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WFMO_Reactor"))); } ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, @@ -1130,8 +1130,8 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, if (this->open (size, 0, sh, tq, 0, notify) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WFMO_Reactor"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WFMO_Reactor"))); } #if defined (ACE_WIN32_VC8) # pragma warning (pop) @@ -1217,8 +1217,8 @@ ACE_WFMO_Reactor::open (size_t size, // Open the handle repository. Two additional handles for internal // purposes if (this->handler_rep_.open (size + 2) == -1) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("opening handler repository")), + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("%p\n"), + ACE_TEXT ("opening handler repository")), -1); else this->delete_handler_rep_ = true; @@ -1246,16 +1246,16 @@ ACE_WFMO_Reactor::open (size_t size, // Open the notification handler if (this->notify_handler_->open (this, this->timer_queue_) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("opening notify handler ")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("opening notify handler ")), -1); // Register for <wakeup_all_threads> event if (this->register_handler (&this->wakeup_all_threads_handler_, this->wakeup_all_threads_.handle ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("registering thread wakeup handler")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("registering thread wakeup handler")), -1); // Since we have added two handles into the handler repository, @@ -2339,11 +2339,11 @@ ACE_WFMO_Reactor::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Count of currently active threads = %d\n"), + ACE_TEXT ("Count of currently active threads = %d\n"), this->active_threads_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("ID of owner thread = %d\n"), + ACE_TEXT ("ID of owner thread = %d\n"), this->owner_)); this->handler_rep_.dump (); @@ -2432,7 +2432,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, // This will get called when <WFMO_Reactor->wakeup_one_thread_> event // is signaled. // ACE_DEBUG ((LM_DEBUG, - // ACE_LIB_TEXT ("(%t) waking up to handle internal notifications\n"))); + // ACE_TEXT ("(%t) waking up to handle internal notifications\n"))); for (int i = 1; ; ++i) { @@ -2488,7 +2488,7 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum, break; default: ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("invalid mask = %d\n"), + ACE_TEXT ("invalid mask = %d\n"), buffer->mask_)); break; } @@ -2689,7 +2689,7 @@ ACE_WFMO_Reactor_Notify::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->timer_queue_->dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Max. iteration: %d\n"), + ACE_TEXT ("Max. iteration: %d\n"), this->max_notify_iterations_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); #endif /* ACE_HAS_DUMP */ diff --git a/ACE/ace/WFMO_Reactor.inl b/ACE/ace/WFMO_Reactor.inl index 7f72fdbe8f6..03407695dd6 100644 --- a/ACE/ace/WFMO_Reactor.inl +++ b/ACE/ace/WFMO_Reactor.inl @@ -19,7 +19,7 @@ ACE_Wakeup_All_Threads_Handler::handle_signal (int /* signum */, { // This will get called when <WFMO_Reactor->wakeup_all_threads_> event // is signaled. There is nothing to be done here. - // ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("(%t) waking up to get updated handle set info\n"))); + // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) waking up to get updated handle set info\n"))); return 0; } @@ -84,31 +84,31 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("I/O Entry = %d\n"), + ACE_TEXT ("I/O Entry = %d\n"), this->io_entry_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handler = %d\n"), + ACE_TEXT ("Event Handler = %d\n"), this->event_handler_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("I/O Handle = %d\n"), + ACE_TEXT ("I/O Handle = %d\n"), this->io_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Network Events = %d\n"), + ACE_TEXT ("Network Events = %d\n"), this->network_events_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Delete Event = %d\n"), + ACE_TEXT ("Delete Event = %d\n"), this->delete_event_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Delete Entry = %d\n"), + ACE_TEXT ("Delete Entry = %d\n"), this->delete_entry_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Close Masks = %d\n"), + ACE_TEXT ("Close Masks = %d\n"), this->close_masks_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -169,11 +169,11 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), + ACE_TEXT ("Event Handle = %d\n"), event_handle)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspend Entry = %d\n"), + ACE_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -242,11 +242,11 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), + ACE_TEXT ("Event Handle = %d\n"), this->event_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Suspend Entry = %d\n"), + ACE_TEXT ("Suspend Entry = %d\n"), this->suspend_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -313,11 +313,11 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const Common_Info::dump (); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Event Handle = %d\n"), + ACE_TEXT ("Event Handle = %d\n"), this->event_handle_)); ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("Resume Entry = %d\n"), + ACE_TEXT ("Resume Entry = %d\n"), this->resume_entry_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); diff --git a/ACE/ace/WIN32_Asynch_IO.cpp b/ACE/ace/WIN32_Asynch_IO.cpp index 2ed1311936e..6ea22949968 100644 --- a/ACE/ace/WIN32_Asynch_IO.cpp +++ b/ACE/ace/WIN32_Asynch_IO.cpp @@ -88,7 +88,7 @@ ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor) if (win32_proactor == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), + ACE_TEXT ("Dynamic cast to WIN32 Proactor failed\n")), -1); // Post myself. @@ -446,8 +446,8 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, // OS should correctly process zero length buffers // if ( msg_space == 0 ) // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") - // ACE_LIB_TEXT ("No space in the message block\n")), + // ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") + // ACE_TEXT ("No space in the message block\n")), // -1); if (msg_space > bytes_to_read) @@ -488,8 +488,8 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, if (bytes_to_read == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Read_Stream::readv:") + ACE_TEXT ("Attempt to read 0 bytes\n")), -1); // Create the Asynch_Result. @@ -544,8 +544,8 @@ ACE_WIN32_Asynch_Read_Stream::readv (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSARecv"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WSARecv"))); } delete result; @@ -610,8 +610,8 @@ ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result * if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ReadFile"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ReadFile"))); } return -1; @@ -827,8 +827,8 @@ ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block, if (bytes_to_write == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Stream::write:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::write:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); ACE_WIN32_Asynch_Write_Stream_Result *result = 0; @@ -915,8 +915,8 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, if ( bytes_to_write == 0 ) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Write_Stream::writev:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); @@ -968,8 +968,8 @@ ACE_WIN32_Asynch_Write_Stream::writev (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSASend"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WSASend"))); } delete result; @@ -1030,8 +1030,8 @@ ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Resul if (ACE::debug ()) ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WriteFile"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WriteFile"))); return -1; } } @@ -1262,8 +1262,8 @@ ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block, if ( bytes_to_read == 0 ) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_File::read:") - ACE_LIB_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Read_File::read:") + ACE_TEXT ("Attempt to read 0 bytes or no space in the message block\n")), -1); @@ -1322,8 +1322,8 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, if (msg_space < page_size) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_File::readv:") - ACE_LIB_TEXT ("Invalid message block size\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Read_File::readv:") + ACE_TEXT ("Invalid message block size\n")), -1); buffer_pointers[buffer_pointers_count].Buffer = msg->wr_ptr (); @@ -1390,8 +1390,8 @@ ACE_WIN32_Asynch_Read_File::readv (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ReadFileScatter"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ReadFileScatter"))); } delete result; @@ -1663,8 +1663,8 @@ ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block, if ( bytes_to_write == 0 ) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_File::write:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Write_File::write:") + ACE_TEXT ("Attempt to read 0 bytes\n")), -1); ACE_WIN32_Asynch_Write_File_Result *result = 0; @@ -1728,8 +1728,8 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, (msg->size () - (msg->rd_ptr () - msg->base ()) < page_size || // message block too small bytes_to_write - total_len > page_size ))// NOT last chunk ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_File::writev:") - ACE_LIB_TEXT ("Invalid message block length\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Write_File::writev:") + ACE_TEXT ("Invalid message block length\n")), -1); buffer_pointers[buffer_pointers_count].Buffer = msg->rd_ptr (); @@ -1795,8 +1795,8 @@ ACE_WIN32_Asynch_Write_File::writev (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WriteFileGather"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WriteFileGather"))); } delete result; @@ -2055,7 +2055,7 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, size_t available_space = message_block.space (); size_t space_needed = bytes_to_read + 2 * address_size; if (available_space < space_needed) - ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("Buffer too small\n")), -1); + ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Buffer too small\n")), -1); // WIN Specific. @@ -2079,8 +2079,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("ACE_OS::socket"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_OS::socket"))); } return -1; } @@ -2141,8 +2141,8 @@ ACE_WIN32_Asynch_Accept::accept (ACE_Message_Block &message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("AcceptEx"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("AcceptEx"))); } return -1; } @@ -2362,8 +2362,8 @@ ACE_WIN32_Asynch_Connect::open (const ACE_Handler::Proxy_Ptr &handler_proxy, // we could not create a new handler without closing the previous if (this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") - ACE_LIB_TEXT ("connector already open \n")), + ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::open:") + ACE_TEXT ("connector already open \n")), -1); //int result = @@ -2394,8 +2394,8 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (!this->flg_open_) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect") - ACE_LIB_TEXT ("connector was not opened before\n")), + ACE_TEXT ("%N:%l:ACE_WIN32_Asynch_Connect::connect") + ACE_TEXT ("connector was not opened before\n")), -1); // Common code for both WIN and WIN32. @@ -2428,8 +2428,8 @@ ACE_WIN32_Asynch_Connect::connect (ACE_HANDLE connect_handle, if (this->result_map_.bind (connect_handle, result) == -1) { ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect: %p\n"), - ACE_LIB_TEXT ("bind"))); + ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect: %p\n"), + ACE_TEXT ("bind"))); result->set_error (EFAULT); return post_result (result, true); } @@ -2471,9 +2471,9 @@ int ACE_WIN32_Asynch_Connect::post_result (ACE_WIN32_Asynch_Connect_Result * res return 0; ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("Error:(%P | %t):%p\n"), - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ") - ACE_LIB_TEXT (" <post_completion> failed"))); + ACE_TEXT ("Error:(%P | %t):%p\n"), + ACE_TEXT ("ACE_WIN32_Asynch_Connect::post_result: ") + ACE_TEXT (" <post_completion> failed"))); } else { @@ -2516,8 +2516,8 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT ("socket")), + ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT ("socket")), -1); } @@ -2534,8 +2534,8 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT ("setsockopt")), + ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT ("setsockopt")), -1); } } @@ -2549,8 +2549,8 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT ("bind")), + ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT ("bind")), -1); } } @@ -2561,8 +2561,8 @@ ACE_WIN32_Asynch_Connect::connect_i (ACE_WIN32_Asynch_Connect_Result *result, result->set_error (errno); ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), - ACE_LIB_TEXT ("set_flags")), + ACE_TEXT ("ACE_WIN32_Asynch_Connect::connect_i: %p\n"), + ACE_TEXT ("set_flags")), -1); } @@ -3020,8 +3020,8 @@ ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("TransmitFile"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("TransmitFile"))); } return -1; } @@ -3290,8 +3290,8 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, // OS should correctly process zero length buffers // if ( msg_space == 0 ) // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") - // ACE_LIB_TEXT ("No space in the message block\n")), + // ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") + // ACE_TEXT ("No space in the message block\n")), // -1); bytes_to_read += msg_space; @@ -3324,8 +3324,8 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, if (bytes_to_read == 0) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") - ACE_LIB_TEXT ("Attempt to read 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Read_Dgram::recv:") + ACE_TEXT ("Attempt to read 0 bytes\n")), -1); // Create the Asynch_Result. @@ -3372,8 +3372,8 @@ ACE_WIN32_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSARecvFrom"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WSARecvFrom"))); } delete result; @@ -3617,8 +3617,8 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, // OS should process zero length block correctly // if ( msg_len == 0 ) // ACE_ERROR_RETURN ((LM_ERROR, - // ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") - // ACE_LIB_TEXT ("Zero-length message block\n")), + // ACE_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") + // ACE_TEXT ("Zero-length message block\n")), // -1); bytes_to_write += msg_len; @@ -3651,8 +3651,8 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, if ( bytes_to_write == 0 ) ACE_ERROR_RETURN ((LM_ERROR, - ACE_LIB_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") - ACE_LIB_TEXT ("Attempt to write 0 bytes\n")), + ACE_TEXT ("ACE_WIN32_Asynch_Write_Dgram::send:") + ACE_TEXT ("Attempt to write 0 bytes\n")), -1); // Create the Asynch_Result. @@ -3701,8 +3701,8 @@ ACE_WIN32_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("WSASendTo"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("WSASendTo"))); } delete result; diff --git a/ACE/ace/WIN32_Proactor.cpp b/ACE/ace/WIN32_Proactor.cpp index 123256ad436..e66ff8c7c0c 100644 --- a/ACE/ace/WIN32_Proactor.cpp +++ b/ACE/ace/WIN32_Proactor.cpp @@ -56,8 +56,8 @@ ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads, this->number_of_threads_); if (this->completion_port_ == 0) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("CreateIoCompletionPort"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("CreateIoCompletionPort"))); this->get_asynch_pseudo_task ().start (); } @@ -135,8 +135,8 @@ ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle, if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("CreateIoCompletionPort"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("CreateIoCompletionPort"))); } return -1; } @@ -589,8 +589,8 @@ ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds) default: if (ACE::debug ()) ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("GetQueuedCompletionStatus"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("GetQueuedCompletionStatus"))); return -1; } } @@ -690,8 +690,8 @@ ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result) if (ACE::debug ()) { ACE_DEBUG ((LM_ERROR, - ACE_LIB_TEXT ("%p\n"), - ACE_LIB_TEXT ("PostQueuedCompletionStatus failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("PostQueuedCompletionStatus failed"))); } return -1; } diff --git a/ACE/ace/XTI_ATM_Mcast.inl b/ACE/ace/XTI_ATM_Mcast.inl index b062f8423b2..7cdfbbf6160 100644 --- a/ACE/ace/XTI_ATM_Mcast.inl +++ b/ACE/ace/XTI_ATM_Mcast.inl @@ -24,7 +24,7 @@ ACE_XTI_ATM_Mcast::ACE_XTI_ATM_Mcast (ACE_TLI_Stream &new_stream, info, rw_flag, udata, opt) == ACE_INVALID_HANDLE && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME)) - ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("%p\n"), ACE_LIB_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); + ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("ACE_TLI_Stream::ACE_TLI_Stream"))); } // Connect the <new_stream> to the <remote_sap>, waiting up to diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index afafc01abcb..fbd00cb8cee 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -53,7 +53,7 @@ // Need to define LD search path explicitly on CE because // CE doesn't have environment variables and we can't get // the information using getenv. -#define ACE_DEFAULT_LD_SEARCH_PATH ACE_LIB_TEXT (".\\;\\windows") +#define ACE_DEFAULT_LD_SEARCH_PATH ACE_TEXT (".\\;\\windows") #define ACE_LACKS_FCNTL_H #define ACE_LACKS_SYS_TYPES_H @@ -102,7 +102,7 @@ #endif // SH3 && _DEBUG #ifndef ACE_DEFAULT_SERVER_HOST -# define ACE_DEFAULT_SERVER_HOST ACE_LIB_TEXT("localhost") +# define ACE_DEFAULT_SERVER_HOST ACE_TEXT("localhost") #endif // ACE_DEFAULT_SERVER_HOST // @@ Need to remap every function that uses any of these flags to diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index 9c0f3bf6efc..395330e7795 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -29,8 +29,8 @@ // Print a console message with the file and line number of the // unsupported function. # include "ace/OS_NS_stdio.h" -# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0) -# define ACE_NOTSUP do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_LIB_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0) +# define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return FAILVALUE; } while (0) +# define ACE_NOTSUP do { errno = ENOTSUP; ACE_OS::fprintf (stderr, ACE_TEXT ("ACE_NOTSUP: %s, line %d\n"), __FILE__, __LINE__); return; } while (0) #else /* ! ACE_HAS_VERBOSE_NOTSUP */ # define ACE_NOTSUP_RETURN(FAILVALUE) do { errno = ENOTSUP ; return FAILVALUE; } while (0) # define ACE_NOTSUP do { errno = ENOTSUP; return; } while (0) @@ -38,7 +38,7 @@ // ---------------------------------------------------------------- -# define ACE_TRACE_IMPL(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__)) +# define ACE_TRACE_IMPL(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__)) // By default tracing is turned off. #if !defined (ACE_NTRACE) diff --git a/ACE/ace/config-borland-common.h b/ACE/ace/config-borland-common.h index a97138fcee5..58e00d7d144 100644 --- a/ACE/ace/config-borland-common.h +++ b/ACE/ace/config-borland-common.h @@ -35,7 +35,7 @@ # endif /* __ACE_INLINE__ */ # endif /* __BORLANDC__ == 0x540 */ -# define ACE_CC_NAME ACE_LIB_TEXT ("Borland C++ Builder") +# define ACE_CC_NAME ACE_TEXT ("Borland C++ Builder") # define ACE_CC_MAJOR_VERSION (__BORLANDC__ / 0x100) # define ACE_CC_MINOR_VERSION (__BORLANDC__ % 0x100) # define ACE_CC_BETA_VERSION (0) @@ -64,8 +64,8 @@ # define ACE_HAS_NEW_NOTHROW # define ACE_TEMPLATES_REQUIRE_SOURCE 1 # define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Lu") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_USES_STD_NAMESPACE_FOR_STDC_LIB 0 # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h index 773336abe7d..04b9e079d51 100644 --- a/ACE/ace/config-cygwin32.h +++ b/ACE/ace/config-cygwin32.h @@ -160,11 +160,11 @@ #define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R // Cygwin DLL suffix is .dll -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dll") +#define ACE_DLL_SUFFIX ACE_TEXT (".dll") // Cygwin runs on Windows, so we have to get the environment variable PATH and // not LD_LIBRARY_PATH which is the default in ACE -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("PATH") +#define ACE_LD_SEARCH_PATH ACE_TEXT ("PATH") #if ACE_MT_SAFE // Yes, we do have threads. diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index f77477e2731..91d20560994 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -387,14 +387,14 @@ // Shared library name/path components #if defined (__ia64) -# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".so") +# define ACE_DLL_SUFFIX ACE_TEXT (".so") #else -# define ACE_DLL_SUFFIX ACE_LIB_TEXT (".sl") +# define ACE_DLL_SUFFIX ACE_TEXT (".sl") #endif /* __ia64 */ #if defined (__LP64__) -# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("LD_LIBRARY_PATH") +# define ACE_LD_SEARCH_PATH ACE_TEXT ("LD_LIBRARY_PATH") #else -# define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("SHLIB_PATH") +# define ACE_LD_SEARCH_PATH ACE_TEXT ("SHLIB_PATH") #endif /* __LP64__ */ #if defined (_INCLUDE__STDC_A1_SOURCE) diff --git a/ACE/ace/config-irix6.x-sgic++.h b/ACE/ace/config-irix6.x-sgic++.h index 318596ea76d..fa2fba567c6 100644 --- a/ACE/ace/config-irix6.x-sgic++.h +++ b/ACE/ace/config-irix6.x-sgic++.h @@ -29,7 +29,7 @@ // #define ACE_HAS_STREAM_PIPES #if defined (_COMPILER_VERSION) -# define ACE_CC_NAME ACE_LIB_TEXT ("SGI/MIPSPro") +# define ACE_CC_NAME ACE_TEXT ("SGI/MIPSPro") # define ACE_CC_MAJOR_VERSION (_COMPILER_VERSION / 100) # define ACE_CC_MINOR_VERSION (_COMPILER_VERSION % 100) # define ACE_CC_BETA_VERSION (0) diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index c60489d2f1b..e4ebf6114f9 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -170,7 +170,7 @@ // this must appear before its #include. # define ACE_HAS_STRING_CLASS # include "ace/config-g++-common.h" -#define ACE_CC_NAME ACE_LIB_TEXT ("g++") +#define ACE_CC_NAME ACE_TEXT ("g++") #define ACE_CC_MAJOR_VERSION __GNUC__ #define ACE_CC_MINOR_VERSION __GNUC_MINOR__ //#define ACE_CC_BETA_VERSION 0 /* ??? */ @@ -372,9 +372,9 @@ #if defined (__ia64) || defined(__alpha) || defined (__x86_64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index 14e60e76760..d1db0fe45ca 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -17,7 +17,7 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #define ACE_LACKS_SUSECONDS_T -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM @@ -180,8 +180,8 @@ // as of Dec 2002, if you use fink you will need to uncomment the next line //#define ACE_NEEDS_DL_UNDERSCORE #define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dylib") +#define ACE_LD_SEARCH_PATH ACE_TEXT ("DYLD_LIBRARY_PATH") +#define ACE_DLL_SUFFIX ACE_TEXT (".dylib") //#define ACE_LACKS_DLCLOSE // gperf seems to need this diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index 5bdc0fe7134..968f652dea8 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -17,7 +17,7 @@ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #if !defined (ACE_SIZEOF_LONG_DOUBLE) # if (__GNUC__ == 3 && __GNUC_MINOR__ == 3) @@ -210,8 +210,8 @@ // as of Dec 2002, if you use fink you will need to uncomment the next line // #define ACE_NEEDS_DL_UNDERSCORE #define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dylib") +#define ACE_LD_SEARCH_PATH ACE_TEXT ("DYLD_LIBRARY_PATH") +#define ACE_DLL_SUFFIX ACE_TEXT (".dylib") //#define ACE_LACKS_DLCLOSE // gperf seems to need this diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index 28467f0a91d..cdcb55ef10e 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -16,7 +16,7 @@ #undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM @@ -180,8 +180,8 @@ // as of Dec 2002, if you use fink you will need to uncomment the next line //#define ACE_NEEDS_DL_UNDERSCORE #define ACE_HAS_SVR4_DYNAMIC_LINKING -#define ACE_LD_SEARCH_PATH ACE_LIB_TEXT ("DYLD_LIBRARY_PATH") -#define ACE_DLL_SUFFIX ACE_LIB_TEXT (".dylib") +#define ACE_LD_SEARCH_PATH ACE_TEXT ("DYLD_LIBRARY_PATH") +#define ACE_DLL_SUFFIX ACE_TEXT (".dylib") #define ACE_LACKS_DLCLOSE // gperf seems to need this diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 29b9bddc458..c0dacb4deb4 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -143,8 +143,8 @@ typedef unsigned long ACE_UINT64; typedef signed long ACE_INT64; -#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%ld") -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%lu") +#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") #elif defined(__i386__) #define ACE_HAS_PENTIUM 1 diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index 736a51a0ab7..370c03d029f 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -26,7 +26,7 @@ #define ACE_OPENVMS 0x0821 -#define ACE_DLL_SUFFIX ACE_LIB_TEXT("") +#define ACE_DLL_SUFFIX ACE_TEXT("") #define ACE_HAS_DUMP 1 diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h index d8fedf532fe..e60f6c87ba5 100644 --- a/ACE/ace/config-qnx-neutrino.h +++ b/ACE/ace/config-qnx-neutrino.h @@ -29,9 +29,9 @@ // The following defines the Neutrino compiler. // gcc should know to call g++ as necessary #ifdef __GNUC__ -# define ACE_CC_NAME ACE_LIB_TEXT ("gcc") +# define ACE_CC_NAME ACE_TEXT ("gcc") #else -# define ACE_CC_NAME ACE_LIB_TEXT ("NTO compiler ??") +# define ACE_CC_NAME ACE_TEXT ("NTO compiler ??") #endif // /usr/nto/include/float.h defines diff --git a/ACE/ace/config-qnx-rtp-common.h b/ACE/ace/config-qnx-rtp-common.h index 0047add1818..66879685763 100644 --- a/ACE/ace/config-qnx-rtp-common.h +++ b/ACE/ace/config-qnx-rtp-common.h @@ -28,9 +28,9 @@ // The following defines the Neutrino compiler. // gcc should know to call g++ as necessary #ifdef __GNUC__ -# define ACE_CC_NAME ACE_LIB_TEXT ("gcc") +# define ACE_CC_NAME ACE_TEXT ("gcc") #else -# define ACE_CC_NAME ACE_LIB_TEXT ("QNX-RTP compiler ??") +# define ACE_CC_NAME ACE_TEXT ("QNX-RTP compiler ??") #endif // /usr/nto/include/float.h defines diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h index a9d6510ea38..fd29f1076aa 100644 --- a/ACE/ace/config-sunos5.10.h +++ b/ACE/ace/config-sunos5.10.h @@ -35,12 +35,12 @@ // Solaris 10 introduced printf() modifiers for [s]size_t types. #if defined (ACE_SSIZE_T_FORMAT_SPECIFIER) # undef ACE_SSIZE_T_FORMAT_SPECIFIER -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%zd") +# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zd") #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ #if defined (ACE_SIZE_T_FORMAT_SPECIFIER) # undef ACE_SIZE_T_FORMAT_SPECIFIER -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT ("%zu") +# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zu") #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 1f9fabd81c8..b9578a212d4 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -375,7 +375,7 @@ #define ACE_HAS_DIRENT #if defined (__SUNPRO_CC) -# define ACE_CC_NAME ACE_LIB_TEXT ("SunPro C++") +# define ACE_CC_NAME ACE_TEXT ("SunPro C++") # define ACE_CC_MAJOR_VERSION (__SUNPRO_CC >> 8) # define ACE_CC_MINOR_VERSION (__SUNPRO_CC & 0x00ff) # define ACE_CC_BETA_VERSION (0) @@ -384,9 +384,9 @@ # define ACE_CC_MINOR_VERSION __GNUC_MINOR__ # define ACE_CC_BETA_VERSION (0) # if __GNUC_MINOR__ >= 90 -# define ACE_CC_NAME ACE_LIB_TEXT ("egcs") +# define ACE_CC_NAME ACE_TEXT ("egcs") # else -# define ACE_CC_NAME ACE_LIB_TEXT ("g++") +# define ACE_CC_NAME ACE_TEXT ("g++") # endif /* __GNUC_MINOR__ */ #endif /* __GNUG__ */ diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index 30a209b2635..b96d033f5d4 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -234,8 +234,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") //========================================================================= // Threads specific parts diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index f88363fe83c..acc49d52fc4 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -235,8 +235,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") // Use larger default buffer size for ease of interoperability #define ACE_DEFAULT_CDR_BUFSIZE 4096 diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h index 2571f0df277..fa72fb3847c 100644 --- a/ACE/ace/config-win32-dmc.h +++ b/ACE/ace/config-win32-dmc.h @@ -23,8 +23,8 @@ # undef ACE_LACKS_STRUCT_DIR #endif -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line -# define ACE_CC_NAME ACE_LIB_TEXT ("Digital Mars") +// Changed ACE_TEXT to ACE_TEXT in the following line +# define ACE_CC_NAME ACE_TEXT ("Digital Mars") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) # define ACE_CC_BETA_VERSION (9) @@ -64,7 +64,7 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines +// Changed ACE_TEXT to ACE_TEXT in the following two lines # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRBUF_T #define ACE_HAS_3_PARAM_WCSTOK @@ -103,7 +103,7 @@ typedef long o_gid_t; #undef tell; # if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") +# define ACE_LD_DECORATOR_STR ACE_TEXT ("d") # endif #include /**/ "ace/post.h" diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h index 998129a7312..dc876f50dca 100644 --- a/ACE/ace/config-win32-ghs.h +++ b/ACE/ace/config-win32-ghs.h @@ -29,8 +29,8 @@ # define ACE_CONFIG_INCLUDE_GHS_COMMON # include "ace/config-ghs-common.h" -// Changed ACE_TEXT to ACE_LIB_TEXT in the following line -# define ACE_CC_NAME ACE_LIB_TEXT ("Green Hills C++") +// Changed ACE_TEXT to ACE_TEXT in the following line +# define ACE_CC_NAME ACE_TEXT ("Green Hills C++") # define ACE_CC_MAJOR_VERSION (1) # define ACE_CC_MINOR_VERSION (8) # define ACE_CC_BETA_VERSION (9) @@ -74,9 +74,9 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_LIB_TEXT in the following two lines -# define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") -# define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") +// Changed ACE_TEXT to ACE_TEXT in the following two lines +# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 // Set the following to zero to placate SString.h ACE_WString CTOR # undef ACE_WSTRING_HAS_USHORT_SUPPORT @@ -89,7 +89,7 @@ # include <stdlib.h> # if !defined (ACE_LD_DECORATOR_STR) && defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") +# define ACE_LD_DECORATOR_STR ACE_TEXT ("d") # endif #include /**/ "ace/post.h" diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index b9c59685622..19ab1999ad5 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -14,7 +14,7 @@ # error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#define ACE_CC_NAME ACE_LIB_TEXT ("g++") +#define ACE_CC_NAME ACE_TEXT ("g++") #define ACE_CC_PREPROCESSOR "cpp" #define ACE_CC_PREPROCESOR_ARGS "" @@ -88,8 +88,8 @@ # define ACE_HAS_PENTIUM #endif -#define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index a9c721df03f..c3bcd716dfc 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -21,7 +21,7 @@ #error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ -#define ACE_CC_NAME ACE_LIB_TEXT ("Visual C++") +#define ACE_CC_NAME ACE_TEXT ("Visual C++") #define ACE_CC_PREPROCESSOR "CL.EXE" #define ACE_CC_PREPROCESSOR_ARGS "-nologo -E" @@ -31,7 +31,7 @@ #if !defined (ACE_LD_DECORATOR_STR) # if defined (_DEBUG) -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") +# define ACE_LD_DECORATOR_STR ACE_TEXT ("d") # endif /* _DEBUG */ #endif /* ACE_LD_DECORATOR_STR */ @@ -133,8 +133,8 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_REGEX_H -#define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") // Turn off warnings for /W4 // To resume any of these warning: #pragma warning(default: 4xxx) |