Mon Jun 16 18:13:21 UTC 2008 Abdullah Sowayan <abdullah.sowayan@lmco.com>

5 files changed, 69 insertions, 62 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ab8fdbe277a..39653649d44 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun 16 18:13:21 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * examples/mfc/Resource.h:
+        * orbsvcs/examples/ORT/Gateway.idl:
+        * orbsvcs/examples/ORT/sum_server.idl:
+        * tests/POA/EndpointPolicy/server.cpp:
+
+          Untabify.
+
 Mon Jun 16 17:51:31 UTC 2008  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tao/EndpointPolicy/EndpointPolicy_Factory.cpp:
diff --git a/TAO/examples/mfc/Resource.h b/TAO/examples/mfc/Resource.h
index bffe833533b..6d26d3724b4 100644
--- a/TAO/examples/mfc/Resource.h
+++ b/TAO/examples/mfc/Resource.h
@@ -12,10 +12,10 @@
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS			1
-#define _APS_NEXT_RESOURCE_VALUE	130
-#define _APS_NEXT_CONTROL_VALUE		1000
-#define _APS_NEXT_SYMED_VALUE		101
-#define _APS_NEXT_COMMAND_VALUE		32771
+#define _APS_3D_CONTROLS 1
+#define _APS_NEXT_RESOURCE_VALUE 130
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 32771
 #endif
 #endif
diff --git a/TAO/orbsvcs/examples/ORT/Gateway.idl b/TAO/orbsvcs/examples/ORT/Gateway.idl
index 7f97783707c..f9b62e41070 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway.idl
+++ b/TAO/orbsvcs/examples/ORT/Gateway.idl
@@ -8,7 +8,7 @@ module Gateway
   interface Object_Factory
   {
     Object create_object (in string interface_repository_id,
-			  in Object gatewayed_object);
+                          in Object gatewayed_object);
   };
 
 };
diff --git a/TAO/orbsvcs/examples/ORT/sum_server.idl b/TAO/orbsvcs/examples/ORT/sum_server.idl
index 31c599c88e4..fdbf0b2a740 100644
--- a/TAO/orbsvcs/examples/ORT/sum_server.idl
+++ b/TAO/orbsvcs/examples/ORT/sum_server.idl
@@ -4,7 +4,6 @@ module ORT
 {
   interface sum_server
   {
-    long add_variables (in long a, 
-			in long b);
+    long add_variables (in long a, in long b);
   };
 };
diff --git a/TAO/tests/POA/EndpointPolicy/server.cpp b/TAO/tests/POA/EndpointPolicy/server.cpp
index 871ad3720b2..015955560a1 100644
--- a/TAO/tests/POA/EndpointPolicy/server.cpp
+++ b/TAO/tests/POA/EndpointPolicy/server.cpp
@@ -55,20 +55,20 @@ parse_args (int argc, char *argv[])
       }
     else if (ACE_OS::strcasecmp(argv[c],"-h") == 0)
       {
-	++c;
-	if (c == argc)
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "host form option requires an argument\n"),-1);
-	form_arg = argv[c];
-	if (ACE_OS::strcasecmp(form_arg,"local") == 0)
-	  host_form = use_localhost;
-	else if (ACE_OS::strcasecmp(form_arg,"default") == 0)
-	  host_form = use_defaulted;
-	else if (ACE_OS::strcasecmp(form_arg,"multi") == 0)
-	  host_form = multi_protocol;
-	else 
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "invalid host form arg, '%s'\n", form_arg), -1);
+        ++c;
+        if (c == argc)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "host form option requires an argument\n"),-1);
+        form_arg = argv[c];
+        if (ACE_OS::strcasecmp(form_arg,"local") == 0)
+          host_form = use_localhost;
+        else if (ACE_OS::strcasecmp(form_arg,"default") == 0)
+          host_form = use_defaulted;
+        else if (ACE_OS::strcasecmp(form_arg,"multi") == 0)
+          host_form = multi_protocol;
+        else
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "invalid host form arg, '%s'\n", form_arg), -1);
       }
     else if (ACE_OS::strstr(argv[c],"-ORB") == argv[c])
       {
@@ -93,13 +93,13 @@ parse_args (int argc, char *argv[])
 
 int
 make_ior (CORBA::ORB_ptr orb,
-	  PortableServer::POA_ptr poa,
-	  Hello * servant,
-	  const char *ior_file)
+          PortableServer::POA_ptr poa,
+          Hello * servant,
+          const char *ior_file)
 {
   CORBA::String_var poa_name = poa->the_name();
   ACE_DEBUG ((LM_DEBUG, "Creating IOR from %s\n", poa_name.in()));
-  
+
   PortableServer::ObjectId_var oid = poa->activate_object (servant);
   CORBA::Object_var o = poa->id_to_reference (oid.in ());
 
@@ -108,16 +108,16 @@ make_ior (CORBA::ORB_ptr orb,
     {
 
       CORBA::String_var ior =
-	orb->object_to_string (o.in ());
+        orb->object_to_string (o.in ());
 
 
 
       FILE *output_file= ACE_OS::fopen (ior_file, "w");
       if (output_file == 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Cannot open output file for writing IOR: %s",
-			   ior_file),
-			  1);
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Cannot open output file for writing IOR: %s",
+                           ior_file),
+                          1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
     }
@@ -141,7 +141,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   char hostname[256];
   int num_extra = 4;
 
-  switch (host_form) 
+  switch (host_form)
     {
     case from_hostname:
       ACE_OS::hostname(hostname,sizeof(hostname));
@@ -251,24 +251,23 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                                                         policies);
 
       if (host_form == use_defaulted)
-	{
-	  ACE_ERROR_RETURN ((LM_DEBUG,
-			     "ERROR: Expected to catch policy error with "
-			     "defaulted hostname, but didn't.\n"),1);
-	}
-
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "ERROR: Expected to catch policy error with "
+                             "defaulted hostname, but didn't.\n"),1);
+        }
     }
   catch (CORBA::PolicyError &)
     {
       if (host_form == use_defaulted)
-	{
-	  ACE_ERROR_RETURN ((LM_DEBUG, 
-			     "Caught expected PolicyError "
-			     "exception with defaulted hostname\n"), 0);
-	}
+        {
+          ACE_ERROR_RETURN ((LM_DEBUG,
+                             "Caught expected PolicyError "
+                             "exception with defaulted hostname\n"), 0);
+        }
       ACE_ERROR_RETURN ((LM_DEBUG,
-			 "ERROR: Unexpectedly caught PolicyError "
-			 "exception host_form = %s\n", form_arg), 1);
+                         "ERROR: Unexpectedly caught PolicyError "
+                         "exception host_form = %s\n", form_arg), 1);
     }
   catch (CORBA::Exception &ex)
     {
@@ -313,34 +312,34 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       int result = 0;
       result = make_ior (orb.in(), root_poa.in(), hello_impl, root_ior_file);
       if (result != 0)
-	return result;
+        return result;
 
       result = make_ior (orb.in(), good_poa.in(), hello_impl, good_ior_file);
       if (result != 0)
-	return result;
+        return result;
 
       good_pm->activate ();
 
       PortableServer::POA_var bad_poa;
 
       if (host_form != multi_protocol)
-	{
-	  bad_poa =
-	    root_poa->create_POA ("badPOA",
-				  bad_pm.in (),
-				  policies);
-	  result = make_ior (orb.in(), bad_poa.in(), hello_impl, bad_ior_file);
-	  if (result != 0)
-	    return result;
-
-	  bad_pm->activate ();
-	}
+        {
+          bad_poa =
+          root_poa->create_POA ("badPOA",
+                                bad_pm.in (),
+                                policies);
+          result = make_ior (orb.in(), bad_poa.in(), hello_impl, bad_ior_file);
+          if (result != 0)
+            return result;
+
+          bad_pm->activate ();
+        }
 
       if (host_form == from_hostname || host_form == use_localhost)
-	{
-	  orb->run ();
-	  ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-	}
+        {
+          orb->run ();
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
+        }
     }
   catch (CORBA::Exception &ex)
     {