ChangeLogTag:Mon Aug 3 02:17:38 UTC 2009 Carlos O'Ryan <coryan@atdesk.com>

12 files changed, 74 insertions, 58 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index bdb93a55e3e..eac5c742ff1 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,19 @@
+Mon Aug  3 02:17:38 UTC 2009  Carlos O'Ryan  <coryan@atdesk.com>
+
+        * tests/Compiler_Features_01_Test.cpp:
+        * tests/Compiler_Features_02_Test.cpp:
+        * tests/Compiler_Features_03_Test.cpp:
+        * tests/Compiler_Features_04_Test.cpp:
+        * tests/Compiler_Features_05_Test.cpp:
+        * tests/Compiler_Features_06_Test.cpp:
+        * tests/Compiler_Features_09_Test.cpp:
+        * tests/Compiler_Features_10_Test.cpp:
+        * tests/Compiler_Features_11_Test.cpp:
+        * tests/Compiler_Features_13_Test.cpp:
+        * tests/Compiler_Features_14_Test.cpp:
+          Fixed all kinds of tab vs. spaces problems.
+          I think I also fixed mis-used ACE_TEXT() concatenation.
+
 Mon Aug  3 12:00:40 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * bin/mail_test_stats.sh:
diff --git a/ACE/tests/Compiler_Features_01_Test.cpp b/ACE/tests/Compiler_Features_01_Test.cpp
index 4ba1a249557..5e1943b314a 100644
--- a/ACE/tests/Compiler_Features_01_Test.cpp
+++ b/ACE/tests/Compiler_Features_01_Test.cpp
@@ -55,7 +55,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_02_Test.cpp b/ACE/tests/Compiler_Features_02_Test.cpp
index 91a02a8206a..7faf1a883cf 100644
--- a/ACE/tests/Compiler_Features_02_Test.cpp
+++ b/ACE/tests/Compiler_Features_02_Test.cpp
@@ -73,7 +73,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_03_Test.cpp b/ACE/tests/Compiler_Features_03_Test.cpp
index d932f864ba3..59cba0840bb 100644
--- a/ACE/tests/Compiler_Features_03_Test.cpp
+++ b/ACE/tests/Compiler_Features_03_Test.cpp
@@ -55,7 +55,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_04_Test.cpp b/ACE/tests/Compiler_Features_04_Test.cpp
index c500f50f24c..4538c784c16 100644
--- a/ACE/tests/Compiler_Features_04_Test.cpp
+++ b/ACE/tests/Compiler_Features_04_Test.cpp
@@ -73,7 +73,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_05_Test.cpp b/ACE/tests/Compiler_Features_05_Test.cpp
index 386d9a4a4d6..0186efbf89b 100644
--- a/ACE/tests/Compiler_Features_05_Test.cpp
+++ b/ACE/tests/Compiler_Features_05_Test.cpp
@@ -58,7 +58,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_06_Test.cpp b/ACE/tests/Compiler_Features_06_Test.cpp
index 7a4c6baf60b..6637131064b 100644
--- a/ACE/tests/Compiler_Features_06_Test.cpp
+++ b/ACE/tests/Compiler_Features_06_Test.cpp
@@ -81,7 +81,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  expected, sum));
+                  expected, sum));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp
index ce32feb36fc..f7f94972289 100644
--- a/ACE/tests/Compiler_Features_09_Test.cpp
+++ b/ACE/tests/Compiler_Features_09_Test.cpp
@@ -80,8 +80,8 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("Destructor count off, expected 1, found %d\n"),
-		 Base::destructors));
+                 ACE_TEXT("Destructor count off, expected 1, found %d\n"),
+                 Base::destructors));
     }
 
   std::auto_ptr<Base> z;
@@ -90,15 +90,15 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("Destructor count off, expected 1, found %d\n"),
-		 Base::destructors));
+                 ACE_TEXT("Destructor count off, expected 1, found %d\n"),
+                 Base::destructors));
     }
   if (x.get())
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("x contents should have been transferred\n")
-		 ));
+                 ACE_TEXT("x contents should have been transferred\n")
+                 ));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp
index b18ef901005..e21e6b1c647 100644
--- a/ACE/tests/Compiler_Features_10_Test.cpp
+++ b/ACE/tests/Compiler_Features_10_Test.cpp
@@ -32,17 +32,17 @@ namespace
   bool had_failure = false;
 
   void check_constructor_count(int expected,
-			       char const * filename,
-			       int lineno);
+                               char const * filename,
+                               int lineno);
   void check_destructor_count(int expected,
-			      char const * filename,
-			      int lineno);
+                              char const * filename,
+                              int lineno);
   void check_alloc_count(int expected,
-			 char const * filename,
-			 int lineno);
+                         char const * filename,
+                         int lineno);
   void reset_counts();
   void never_reached(char const * filename,
-		     int lineno);
+                     int lineno);
   int status();
 
   /**
@@ -91,9 +91,9 @@ namespace
       : Base()
     {
       if (do_raise)
-	{
-	  throw std::runtime_error("requested exception");
-	}
+        {
+          throw std::runtime_error("requested exception");
+        }
       // ... if an exception is raised this object is never
       // initialized and no constructor / destructor calls should take
       // place ...
@@ -203,8 +203,8 @@ namespace
 
 void
 check_constructor_count(int expected,
-			char const * filename,
-			int lineno)
+                        char const * filename,
+                        int lineno)
 {
   if (constructors == expected)
     {
@@ -212,14 +212,14 @@ check_constructor_count(int expected,
     }
   had_failure = true;
   ACE_ERROR ((LM_ERROR,
-	      ACE_TEXT("Expected %d constructor calls, had %d -- (%s:%d)\n"),
-	      expected, constructors, filename, lineno));
+              ACE_TEXT("Expected %d constructor calls, had %d -- (%s:%d)\n"),
+              expected, constructors, filename, lineno));
 }
 
 void
 check_destructor_count(int expected,
-		       char const * filename,
-		       int lineno)
+                       char const * filename,
+                       int lineno)
 {
   if (destructors == expected)
     {
@@ -227,14 +227,14 @@ check_destructor_count(int expected,
     }
   had_failure = true;
   ACE_ERROR ((LM_ERROR,
-	      ACE_TEXT("Expected %d destructor calls, had %d -- (%s:%d)\n"),
-	      expected, destructors, filename, lineno));
+              ACE_TEXT("Expected %d destructor calls, had %d -- (%s:%d)\n"),
+              expected, destructors, filename, lineno));
 }
 
 void
 check_alloc_count(int expected,
-		  char const * filename,
-		  int lineno)
+                  char const * filename,
+                  int lineno)
 {
   if (allocs == expected && deallocs == expected)
     {
@@ -244,25 +244,25 @@ check_alloc_count(int expected,
   if (allocs != expected)
     {
       ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT("Expected %d alloc calls, had %d -- (%s:%d)\n"),
-		  expected, allocs, filename, lineno));
+                  ACE_TEXT("Expected %d alloc calls, had %d -- (%s:%d)\n"),
+                  expected, allocs, filename, lineno));
     }
   if (deallocs != expected)
     {
       ACE_ERROR ((LM_ERROR,
-		  ACE_TEXT("Expected %d dealloc calls, had %d -- (%s:%d)\n"),
-		  expected, deallocs, filename, lineno));
+                  ACE_TEXT("Expected %d dealloc calls, had %d -- (%s:%d)\n"),
+                  expected, deallocs, filename, lineno));
     }
 }
 
 void
 never_reached(char const * filename,
-	      int lineno)
+              int lineno)
 {
   had_failure = true;
   ACE_ERROR ((LM_ERROR,
-	      ACE_TEXT("Code should not have reached (%s:%d)\n"),
-	      filename, lineno));
+              ACE_TEXT("Code should not have reached (%s:%d)\n"),
+              filename, lineno));
 }
 
 void
diff --git a/ACE/tests/Compiler_Features_11_Test.cpp b/ACE/tests/Compiler_Features_11_Test.cpp
index da5875c1a7b..9471ed5f0ff 100644
--- a/ACE/tests/Compiler_Features_11_Test.cpp
+++ b/ACE/tests/Compiler_Features_11_Test.cpp
@@ -41,7 +41,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %s got %s\n"),
-		  expected.c_str(), os.str().c_str()));
+                  expected.c_str(), os.str().c_str()));
     }
 
   // ... create an input stream from the result ...
@@ -56,7 +56,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR ((LM_ERROR, ACE_TEXT("Expected %d got %d\n"),
-		  12345, v));
+                  12345, v));
     }
 
   ACE_END_TEST;
diff --git a/ACE/tests/Compiler_Features_13_Test.cpp b/ACE/tests/Compiler_Features_13_Test.cpp
index f9f4317cbfc..58f271d6872 100644
--- a/ACE/tests/Compiler_Features_13_Test.cpp
+++ b/ACE/tests/Compiler_Features_13_Test.cpp
@@ -67,11 +67,11 @@ run_main (int, ACE_TCHAR *[])
 
     if (x != 3)
       {
-	status = 1;
-	ACE_ERROR((LM_ERROR,
-		   ACE_TEXT("Wrong value after const_cast,"
-			    " expected %d, got %d\n"),
-		   3, x));
+        status = 1;
+        ACE_ERROR((LM_ERROR,
+                   ACE_TEXT("Wrong value after const_cast,")
+                   ACE_TEXT(" expected %d, got %d\n"),
+                   3, x));
       }
   }
 
@@ -84,14 +84,14 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("dynamic_cast returns null, expected value\n")));
+                 ACE_TEXT("dynamic_cast returns null, expected value\n")));
     }
   d1->value = 42;
   if (d.value != 42)
     {
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("Wrong value after dynamic_cast, expected %d, got %d\n"),
-		 42, d.value));
+                 ACE_TEXT("Wrong value after dynamic_cast, expected %d, got %d\n"),
+                 42, d.value));
     }
   
   // Make sure dynamic cast detects invalid casts
@@ -102,7 +102,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("dynamic_cast should return null\n")));
+                 ACE_TEXT("dynamic_cast should return null\n")));
     }
 
   // Make sure dynamic cast raises an exception
@@ -113,7 +113,7 @@ run_main (int, ACE_TCHAR *[])
 
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("dynamic_cast should have raised exception\n")));
+                 ACE_TEXT("dynamic_cast should have raised exception\n")));
     }
   catch(std::exception const &)
     {
@@ -122,7 +122,7 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("dynamic_cast should have raised std::exception\n")));
+                 ACE_TEXT("dynamic_cast should have raised std::exception\n")));
     }
 
   {
@@ -133,9 +133,9 @@ run_main (int, ACE_TCHAR *[])
 
     if (z == 0)
       {
-	ACE_ERROR((LM_ERROR,
-		   ACE_TEXT("My hack to make sure the code is not "
-			    "optimized away backfired!\n")));
+        ACE_ERROR((LM_ERROR,
+                   ACE_TEXT("My hack to make sure the code is not ")
+                   ACE_TEXT("optimized away backfired!\n")));
       }
   }
 
diff --git a/ACE/tests/Compiler_Features_14_Test.cpp b/ACE/tests/Compiler_Features_14_Test.cpp
index e95b474887c..ab9355422a9 100644
--- a/ACE/tests/Compiler_Features_14_Test.cpp
+++ b/ACE/tests/Compiler_Features_14_Test.cpp
@@ -90,21 +90,21 @@ run_main (int, ACE_TCHAR *[])
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("int should not be a pointer\n")));
+                 ACE_TEXT("int should not be a pointer\n")));
     }
 
   if (! test::is_pointer<int*>())
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("int* should be a pointer\n")));
+                 ACE_TEXT("int* should be a pointer\n")));
     }
 
   if (test::is_pointer<int&>())
     {
       status = 1;
       ACE_ERROR((LM_ERROR,
-		 ACE_TEXT("int& should not be a pointer\n")));
+                 ACE_TEXT("int& should not be a pointer\n")));
     }
 
   ACE_END_TEST;