Wed Aug 1 07:27:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

15 files changed, 92 insertions, 98 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c15f50d4aa5..c8e5ace198a 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,29 @@
+Wed Aug  1 07:27:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Config.h:
+          Fixed argument not used warning
+
+        * apps/JAWS/clients/Blobby/Blob_Handler.cpp:
+          Removed ACE_LIB_TEXT in comment
+
+        * bin/fuzz.pl:
+          Removed exception fuzz check. We have deprecated ACE_THROW
+
+        * contrib/FaCE/FaCE.cpp:
+        * contrib/FaCE/FaCE.h:
+        * examples/ASX/Event_Server/Event_Server/Options.cpp:
+        * examples/ASX/UPIPE_Event_Server/Options.cpp:
+        * tests/Bug_2609_Regression_Test.cpp:
+        * tests/Bug_2610_Regression_Test.cpp:
+        * tests/Config_Test.cpp:
+        * tests/Proactor_Test.cpp:
+        * tests/Proactor_Test_IPV6.cpp:
+        * tests/Svc_Handler_Test.cpp:
+          Replaced ACE_LIB_TEXT with ACE_TEXT
+
+        * tests/Bug_2975_Regression_Test.cpp:
+          Make sure we return the correct value out of main
+
 Wed Aug  1 06:51:11 UTC 2007  Olli Savia  <ops@iki.fi>
 
         * ace/OS_NS_dirent.h:
diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h
index be7e717d527..395ae28b3a1 100644
--- a/ACE/ace/Service_Config.h
+++ b/ACE/ace/Service_Config.h
@@ -154,7 +154,10 @@ public:
 /// know why ...
 
 template<> inline void
-ACE_TSS<ACE_Service_Gestalt>::cleanup (void*p) {};
+ACE_TSS<ACE_Service_Gestalt>::cleanup (void*p)
+{
+  ACE_UNUSED_ARG (p);
+};
 
 
 /**
diff --git a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
index 384d10a1175..8ae5cde6e9b 100644
--- a/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
+++ b/ACE/apps/JAWS/clients/Blobby/Blob_Handler.cpp
@@ -280,7 +280,7 @@ ACE_Blob_Writer::send_request (void)
 
   // Create the header, store the actual length in mesglen.
   // NOTE! %lu is really what's wanted. ACE_SIZE_T_FORMAT_SPECIFIER is
-  // defined in terms of ACE_LIB_TEXT which is NOT what we want here.
+  // defined in terms of ACE_TEXT which is NOT what we want here.
   mesglen = ACE_OS::sprintf (mesg, "%s /%s %s %lu\n\n",
                              request_prefix_, filename_, request_suffix_,
                              (unsigned long)length_);
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index dc102de3a5c..1a8b527e9a4 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -581,42 +581,6 @@ sub check_for_lack_ACE_OS ()
     }
 }
 
-# This test checks for the use of exception specification,
-# exception specification has fallen out of favor, and generally
-# should not be used.
-sub check_for_exception_spec ()
-{        
-    print "Running exception specification check\n";
-    
-    foreach $file (@files_cpp, @files_inl, @files_h) {
-        if (open (FILE, $file)) {
-            my $disable = 0;
-            print "Looking at file $file\n" if $opt_d;
-            while (<FILE>) {
-                ++$line;
-                if (/FUZZ\: disable check_for_exception_sepc/) {
-                    $disable = 1;
-                }
-                if (/FUZZ\: enable check_for_exception_sepc/) {
-                    $disable = 0;
-                }
-                if ($disable == 0) {
-                    if(/throw\s*\(\s*\)/) {
-                        #next;
-                    }
-                    elsif(/(^|\s+)throw\s*\(/ and $` !~ /\/\// and $` !~ /\/\*/ and $` !~ /\*\*+/ and $` !~ /\s+\*+\s+/) {
-                        print_error ("$file:$.: exception specification found");                    
-                    }
-                }
-            }
-            close (FILE);
-        }
-        else {
-            print STDERR "Error: Could not open $file\n";
-        }
-    }    
-}
-
 # This test checks for the use of NULL,
 # NULL shouldn't be used, use 0 instead
 sub check_for_NULL ()
@@ -1665,7 +1629,6 @@ if (!getopts ('cdhl:t:mv') || $opt_h) {
            check_for_id_string
            check_for_newline
            check_for_tab
-           check_for_exception_spec
            check_for_NULL
            check_for_improper_main_declaration
            check_for_lack_ACE_OS
diff --git a/ACE/contrib/FaCE/FaCE.cpp b/ACE/contrib/FaCE/FaCE.cpp
index a959c34fb81..75a982564bd 100644
--- a/ACE/contrib/FaCE/FaCE.cpp
+++ b/ACE/contrib/FaCE/FaCE.cpp
@@ -21,7 +21,7 @@
 // This utility does not use ACE, and shouldn't.
 //FUZZ: disable check_for_lack_ACE_OS
 
-ACE_TCHAR* g_ParameterFileName = ACE_LIB_TEXT("Parameters.txt");
+ACE_TCHAR* g_ParameterFileName = ACE_TEXT("Parameters.txt");
 
 /**
  * This simple and small class manages user-input command line
@@ -115,12 +115,12 @@ void ParameterList::addParameter(ACE_TCHAR* newParameter)
 void ParameterList::saveParameter(FILE* outputFile)
 {
     if ( (outputFile == 0) && (this->param_ != 0) ) {
-        outputFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("w+"));
+        outputFile = _wfopen(g_ParameterFileName, ACE_TEXT("w+"));
     }
 
     if (outputFile != 0) {
         if (this->param_ != 0) {
-            fwprintf(outputFile, ACE_LIB_TEXT("%s\n"), this->param_);
+            fwprintf(outputFile, ACE_TEXT("%s\n"), this->param_);
             this->next_->saveParameter(outputFile);
         }
         else {
@@ -176,7 +176,7 @@ void InitSetup()
 
 void LoadParameterHistory()
 {
-    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_LIB_TEXT("r"));
+    FILE* parameterFile = _wfopen(g_ParameterFileName, ACE_TEXT("r"));
 
     if (parameterFile != 0) {
         while (feof(parameterFile) == 0) {
@@ -209,7 +209,7 @@ void LoadParameterHistory()
 //
 //  COMMENTS:
 //
-//    It is important to call this function so that the application 
+//    It is important to call this function so that the application
 //    will get 'well formed' small icons associated with it.
 //
 ATOM MyRegisterClass(HINSTANCE hInstance, ACE_TCHAR* szWindowClass)
@@ -311,7 +311,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
     PAINTSTRUCT ps;
     RECT textRect;
 
-    switch (message) 
+    switch (message)
     {
         case WM_COMMAND:
             wmId    = LOWORD(wParam);
@@ -331,19 +331,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 case ID_SETTING_RUN:
                     {
 #ifdef NO_ACE
-                        cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl;
+                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
                         CE_ARGV ce_argv(g_CommandLine);
                         main_i(ce_argv.argc(), ce_argv.argv());
-                        cout << ACE_LIB_TEXT("END") << endl << endl;
+                        cout << ACE_TEXT("END") << endl << endl;
 #else
-                        cout << ACE_LIB_TEXT("START with command line: ") << g_CommandLine << endl;
+                        cout << ACE_TEXT("START with command line: ") << g_CommandLine << endl;
                         ACE_ARGV ce_argv(g_CommandLine);
                         ACE::init();
                         ACE_LOG_MSG->msg_callback(&cout);  // register call back
                         ACE_LOG_MSG->set_flags(ACE_Log_Msg::MSG_CALLBACK);  // set call back flag
                         ace_main_i(ce_argv.argc(), ce_argv.argv());
                         ACE::fini();
-                        cout << ACE_LIB_TEXT("END") << endl << endl;
+                        cout << ACE_TEXT("END") << endl << endl;
 #endif  // NO_ACE
                     }
                     break;
@@ -378,7 +378,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             mbi.nBmpId     = 0;
             mbi.cBmpImages = 0;
 
-            if (!SHCreateMenuBar(&mbi)) 
+            if (!SHCreateMenuBar(&mbi))
                 return 0;
 
             g_hwndCB = mbi.hwndMB;
@@ -390,7 +390,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             GetClientRect(hWnd, &textRect);
             nCmdHt = CommandBar_Height(mbi.hwndMB);
 
-            hWndEdit = CreateWindow(ACE_LIB_TEXT("EDIT"),
+            hWndEdit = CreateWindow(ACE_TEXT("EDIT"),
                                     0,
                                     WS_CHILD | WS_VISIBLE | ES_READONLY | ES_MULTILINE | WS_VSCROLL | WS_HSCROLL,
                                     0,
@@ -448,7 +448,7 @@ HWND CreateRpCommandBar(HWND hwnd)
     mbi.nBmpId     = 0;
     mbi.cBmpImages = 0;
 
-    if (!SHCreateMenuBar(&mbi)) 
+    if (!SHCreateMenuBar(&mbi))
         return 0;
 
     return mbi.hwndMB;
@@ -459,7 +459,7 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     SHINITDLGINFO shidi;
 
-    ACE_TCHAR* copyrightNote = ACE_LIB_TEXT(
+    ACE_TCHAR* copyrightNote = ACE_TEXT(
 "ACE® and TAO® are copyrighted by Dr. Douglas C. Schmidt and Center for Distributed Object \
 Computing at Washington University,© 1993-2002, all rights reserved.  \
 FaCE is copyrighted by Object Computing, Inc.,© 2002,\n all rights reserved.\n\
@@ -474,7 +474,7 @@ See License.txt for more information.");
             shidi.hDlg = hDlg;
             SHInitDialog(&shidi);
             SetDlgItemText(hDlg, IDC_COPYRIGHT, copyrightNote);
-            return TRUE; 
+            return TRUE;
 
         case WM_COMMAND:
             if (LOWORD(wParam) == IDOK)
@@ -554,7 +554,7 @@ LRESULT CALLBACK SaveFileName(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
             GetDlgItemText(hDlg, IDC_SAVEFILE, tempBuffer, MAX_LOADSTRING - 1);
             EndDialog(hDlg, wmId);
 
-            tempFile = _wfopen(tempBuffer, ACE_LIB_TEXT("r"));
+            tempFile = _wfopen(tempBuffer, ACE_TEXT("r"));
 
             if (tempFile != 0)  // if file exists
             {
@@ -622,7 +622,7 @@ LRESULT CALLBACK FileError(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
     switch (message)
     {
         case WM_INITDIALOG:
-            return TRUE; 
+            return TRUE;
 
         case WM_COMMAND:
             if (LOWORD(wParam) == IDOK)
diff --git a/ACE/contrib/FaCE/FaCE.h b/ACE/contrib/FaCE/FaCE.h
index 8a4b80425d9..ef1842323c0 100644
--- a/ACE/contrib/FaCE/FaCE.h
+++ b/ACE/contrib/FaCE/FaCE.h
@@ -30,7 +30,7 @@
 #include "CE_Screen_Output.h"
 
 #define ACE_TCHAR wchar_t
-#define ACE_LIB_TEXT(STRING) L##STRING
+#define ACE_TEXT(STRING) L##STRING
 #define ACE_CE_Screen_Output CE_Screen_Output
 
 int main_i(int, wchar_t**);
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
index 3304c86ac6b..8683f48d153 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Options.cpp
@@ -183,9 +183,9 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
   // This is a major hack to get the size_t format spec to be a narrow
   // char, same as the other strings for printf() here. It only works
   // because this is the end of the source file. It makes the
-  // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_LIB_TEXT, effectively.
-#undef ACE_LIB_TEXT
-#define ACE_LIB_TEXT(A) A
+  // ACE_SIZE_T_FORMAT_SPECIFIER not use ACE_TEXT, effectively.
+#undef ACE_TEXT
+#define ACE_TEXT(A) A
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
                     ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
index c445d1174aa..033132610aa 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Options.cpp
@@ -165,8 +165,8 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
                               "\t[-H high water mark]\n"
                               "\t[-i number of test iterations]\n"
                               "\t[-L low water mark]\n"
-                              "\t[-M] message size \n" 
-                              "\t[-n] (THR_NEW_LWP)\n" 
+                              "\t[-M] message size \n"
+                              "\t[-n] (THR_NEW_LWP)\n"
                               "\t[-q max queue size]\n"
                               "\t[-S supplier file]\n"
                               "\t[-s supplier port]\n"
@@ -178,13 +178,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       }
 
-  // HACK! This needs to be done to avoid the mismatch from ACE_LIB_TEXT
+  // HACK! This needs to be done to avoid the mismatch from ACE_TEXT
   // in ACE_SIZE_T_FORMAT_SPECIFIER to narrow-char on wide-char builds.
   // It only works because it's at the end of the file.
-# if defined (ACE_LIB_TEXT)
-#  undef ACE_LIB_TEXT
+# if defined (ACE_TEXT)
+#  undef ACE_TEXT
 # endif
-# define ACE_LIB_TEXT(X) X
+# define ACE_TEXT(X) X
   if (this->verbose ())
     ACE_OS::printf ("%8d = initial concurrency hint\n"
                     ACE_SIZE_T_FORMAT_SPECIFIER " = total iterations\n"
diff --git a/ACE/tests/Bug_2609_Regression_Test.cpp b/ACE/tests/Bug_2609_Regression_Test.cpp
index b8c42b5a441..734ba205acd 100644
--- a/ACE/tests/Bug_2609_Regression_Test.cpp
+++ b/ACE/tests/Bug_2609_Regression_Test.cpp
@@ -26,7 +26,7 @@ ACE_RCSID (tests,
 
 #if defined (ACE_HAS_THREADS)
 
-# define TEST_TRACE(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__))
+# define TEST_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__))
 
 bool g_handler_deleted = false;
 // use semaphore for synchronization
diff --git a/ACE/tests/Bug_2610_Regression_Test.cpp b/ACE/tests/Bug_2610_Regression_Test.cpp
index e370405569f..648e90bf2d2 100644
--- a/ACE/tests/Bug_2610_Regression_Test.cpp
+++ b/ACE/tests/Bug_2610_Regression_Test.cpp
@@ -27,7 +27,7 @@ ACE_RCSID (tests,
 
 #if defined (ACE_HAS_THREADS)
 
-# define TEST_TRACE(X) ACE_Trace ____ (ACE_LIB_TEXT (X), __LINE__, ACE_LIB_TEXT (__FILE__))
+# define TEST_TRACE(X) ACE_Trace ____ (ACE_TEXT (X), __LINE__, ACE_TEXT (__FILE__))
 
 int g_svc_handlers_leaked = 0;
 // use semaphore for synchronization
diff --git a/ACE/tests/Bug_2975_Regression_Test.cpp b/ACE/tests/Bug_2975_Regression_Test.cpp
index 65d73843714..dec427fad9b 100644
--- a/ACE/tests/Bug_2975_Regression_Test.cpp
+++ b/ACE/tests/Bug_2975_Regression_Test.cpp
@@ -23,6 +23,8 @@ run_main (int, ACE_TCHAR *argv[])
 {
   ACE_START_TEST (ACE_TEXT ("Bug_2975_Regression_Test"));
 
+  int ret = 0;
+
   ACE_ARGV args;
   args.add (argv[0], true);
   args.add (ACE_TEXT("-S"));
@@ -44,11 +46,11 @@ run_main (int, ACE_TCHAR *argv[])
       ACE_TEXT ("</ACE_Svc_Conf>'"));
 #endif // not (ACE_USES_CLASSIC_SVC_CONF == 1)
 
-  int ret = ACE_Service_Config::open(args.argc(), args.argv(),
-                                     ACE_DEFAULT_LOGGER_KEY,
-                                     1, 1);
+  ret = ACE_Service_Config::open(args.argc(), args.argv(),
+                                 ACE_DEFAULT_LOGGER_KEY,
+                                 1, 1);
 
-  if (-1 == ret)
+  if (0 != ret)
   {
     ACE_ERROR ((LM_ERROR, ACE_TEXT ("ACE_Service_Config::open() failed\n")));
   }
diff --git a/ACE/tests/Config_Test.cpp b/ACE/tests/Config_Test.cpp
index 7dd822d6f08..881b33da542 100644
--- a/ACE/tests/Config_Test.cpp
+++ b/ACE/tests/Config_Test.cpp
@@ -101,22 +101,22 @@ test (ACE_Configuration *config,
     return -8;
   else if (intvalue != 42)
     return -9;
-  
+
   u_char *data_out (0);
-  
+
   {
     void *data_tmp = 0; // Workaround for GCC strict aliasing warning.
     size_t length = 0;
-    
+
     if (config->get_binary_value (testsection,
                                   ACE_TEXT ("binvalue"),
                                   data_tmp,
                                   length))
       return -10;
-  
+
     data_out = reinterpret_cast <u_char *> (data_tmp);
   }
-  
+
   // compare em
   for (int j = 0; j < 80; j++)
     if (data_out[j] != data[j])
@@ -986,7 +986,7 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
                             // we're not equal if we cannot get rhs int
                             rc = false;
 
-                          ACE_OS::sprintf (int_value, ACE_LIB_TEXT ("%08x"), intValue);
+                          ACE_OS::sprintf (int_value, ACE_TEXT ("%08x"), intValue);
                           originalString = int_value;
                         }
                       else if (originalType == ACE_Configuration::BINARY)
@@ -1008,10 +1008,10 @@ iniCompare (ACE_Configuration_Heap& fromFile, ACE_Configuration_Heap& original)
                               while (binary_length)
                                 {
                                   if (ptr != binary_data)
-                                    originalString += ACE_LIB_TEXT (",");
+                                    originalString += ACE_TEXT (",");
 
                                   ACE_OS::sprintf (bin_value,
-                                                   ACE_LIB_TEXT ("%02x"),
+                                                   ACE_TEXT ("%02x"),
                                                    *ptr);
                                   originalString += bin_value;
                                   --binary_length;
@@ -1095,18 +1095,18 @@ int Config_Test::change_one (ACE_Configuration &cfg, u_int a)
 	ACE_Configuration_Section_Key NetworkSection;
 	ACE_Configuration_Section_Key LoggerSection;
 	ACE_Configuration_Section_Key BinarySection;
-	
+
 	if (cfg.open_section (root,
 		ACE_TEXT ("network"),
 		1,
 		NetworkSection))
 		return -1;
-	
+
 	if (cfg.set_integer_value (NetworkSection,
 		ACE_TEXT ("TimeToLive"),
 		a))
 		return -2;
-	
+
 	return 0;
 }
 
@@ -1362,7 +1362,7 @@ Config_Test::testRegFormat ()
                            ACE_TEXT ("equal original (%d)\n"),
                            rc),
                           -1);
-		
+
 		// 7.1 Change a value and test NOT equal case
 		change_one (original, 101);
 		if (fromFile == original)
@@ -1382,7 +1382,7 @@ Config_Test::testRegFormat ()
 				rc),
 				-1);
 		}
-		
+
     }// end if heap could not be opened.
   else
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/ACE/tests/Proactor_Test.cpp b/ACE/tests/Proactor_Test.cpp
index 1b42afb8c7c..861def76e50 100644
--- a/ACE/tests/Proactor_Test.cpp
+++ b/ACE/tests/Proactor_Test.cpp
@@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num)
   if (this->open (1, 0, 1) != 0)
   {
      ACE_ERROR ((LM_ERROR,
-                 ACE_LIB_TEXT ("(%t) %p\n"),
-                 ACE_LIB_TEXT ("Connector::open failed")));
+                 ACE_TEXT ("(%t) %p\n"),
+                 ACE_TEXT ("Connector::open failed")));
      return rc;
   }
 
diff --git a/ACE/tests/Proactor_Test_IPV6.cpp b/ACE/tests/Proactor_Test_IPV6.cpp
index cd01d31b063..f1cc290b93a 100644
--- a/ACE/tests/Proactor_Test_IPV6.cpp
+++ b/ACE/tests/Proactor_Test_IPV6.cpp
@@ -1104,8 +1104,8 @@ Connector::start (const ACE_INET_Addr& addr, int num)
   if (this->open (1, 0, 1) != 0)
   {
      ACE_ERROR ((LM_ERROR,
-                 ACE_LIB_TEXT ("(%t) %p\n"),
-                 ACE_LIB_TEXT ("Connector::open failed")));
+                 ACE_TEXT ("(%t) %p\n"),
+                 ACE_TEXT ("Connector::open failed")));
      return rc;
   }
 
diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp
index f41eed6367d..d7342808799 100644
--- a/ACE/tests/Svc_Handler_Test.cpp
+++ b/ACE/tests/Svc_Handler_Test.cpp
@@ -40,23 +40,23 @@ run_test (SVC_HANDLER &svc_handler,
     {
       ACE_Message_Block *mb = 0;
       ACE_NEW (mb,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("hello "))));
+               ACE_Message_Block (sizeof (ACE_TEXT("hello "))));
 
       ACE_Message_Block *cb1 = 0;
       ACE_NEW (cb1,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n"))));
+               ACE_Message_Block (sizeof (ACE_TEXT("there\n"))));
 
       ACE_Message_Block *cb2 = 0;
       ACE_NEW (cb2,
-               ACE_Message_Block (sizeof (ACE_LIB_TEXT("there\n"))));
+               ACE_Message_Block (sizeof (ACE_TEXT("there\n"))));
 
       mb->copy ("hello ",
-                ACE_OS::strlen (ACE_LIB_TEXT("hello ")));
+                ACE_OS::strlen (ACE_TEXT("hello ")));
       cb1->copy ("there ",
-                 ACE_OS::strlen (ACE_LIB_TEXT("there ")));
+                 ACE_OS::strlen (ACE_TEXT("there ")));
       mb->cont (cb1);
       cb2->copy ("doug\n",
-                ACE_OS::strlen (ACE_LIB_TEXT("doug\n")));
+                ACE_OS::strlen (ACE_TEXT("doug\n")));
       cb1->cont (cb2);
 
       // Note that this is a buffered call!
@@ -126,15 +126,15 @@ run_main (int argc, ACE_TCHAR *argv[])
 
     ACE_FILE_Info info;
     file_io.get_info (info);
-    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("file size = %d\n"), info.size_));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("file size = %d\n"), info.size_));
 
     for (ssize_t n_bytes; (n_bytes = file_io.recv (buf, ACE_MAXLOGMSGLEN)) > 0; )
       {
         buf[n_bytes] = '\0';
-        ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("%s"), ACE_TEXT_CHAR_TO_TCHAR(buf)));
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT("%s"), ACE_TEXT_CHAR_TO_TCHAR(buf)));
       }
 
-    ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT("\n")));
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n")));
 
     file_io.close ();