diff options
Diffstat (limited to 'ACE/examples/ASX')
4 files changed, 18 insertions, 26 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 8a74e8039b4..3cafe8d1149 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -125,11 +125,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 @@ -142,7 +137,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 81e20cfc3c7..68ac0b56e6c 100644 --- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -131,11 +131,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 @@ -148,7 +143,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"), diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp index 153fbd557e4..75755e7d538 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp @@ -117,13 +117,10 @@ Consumer_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# consumer router\n")); diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp index f372147bf67..9eaa54699a4 100644 --- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp +++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp @@ -116,13 +116,10 @@ Supplier_Router::info (ACE_TCHAR **strp, size_t length) const if (sa.get_local_addr (addr) == -1) return -1; -#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR) -# define FMTSTR ACE_TEXT ("%ls\t %ls/ %ls") -#else -# define FMTSTR ACE_TEXT ("%s\t %s/ %s") -#endif - - ACE_OS::sprintf (buf, FMTSTR, + ACE_OS::sprintf (buf, + ACE_TEXT ("%") ACE_TEXT_PRIs + ACE_TEXT ("\t %") ACE_TEXT_PRIs + ACE_TEXT ("/ %") ACE_TEXT_PRIs, module_name, ACE_TEXT ("upipe"), ACE_TEXT ("# supplier router\n")); |