diff options
Diffstat (limited to 'ACE/examples/ASX/Event_Server')
-rw-r--r-- | ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp | 11 | ||||
-rw-r--r-- | ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 489a6d3dacc..287fefcf1fc 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -124,11 +124,6 @@ Consumer_Router::put (ACE_Message_Block *mb, } // Return information about the <Consumer_Router>. -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Consumer_Router::info (ACE_TCHAR **strp, size_t length) const @@ -141,7 +136,11 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 8b5e41dab67..edea2f8968d 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -130,11 +130,6 @@ Supplier_Router::put (ACE_Message_Block *mb, } // Return information about the <Supplier_Router>. -#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%s\t %d/%s %s (%s)\n") -#else -# define FMTSTR ACE_TEXT ("%ls\t %d/%ls %ls (%ls)\n") -#endif /* ACE_WIN32 || !ACE_USES_WCHAR */ int Supplier_Router::info (ACE_TCHAR **strp, size_t length) const @@ -147,7 +142,11 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const return -1; ACE_OS::sprintf (buf, - FMTSTR, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %d/%") ACE_TEXT_PRIs + ACE_TEXT (" %") ACE_TEXT_PRIs + ACE_TEXT (" (%") ACE_TEXT_PRIs + ACE_TEXT (")\n"), module_name, addr.get_port_number (), ACE_TEXT ("tcp"), |