6 files changed, 9 insertions, 13 deletions

diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
index e939ee6aa9b..206ce4d9dd5 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami {
   custom_only = 1
 }
 
-project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_micro  {
+project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba {
   after += *idl
   source_files {
     client.cpp
@@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, av
   }
 }
 
-project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_micro {
+project(*server) : taoserver, naming, ami, avoids_minimum_corba {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
index e98c3833422..8fe7394e001 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode {
   custom_only = 1
 }
 
-project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_micro {
+project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba {
   after += *idl
   source_files {
     client.cpp
@@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_mini
   }
 }
 
-project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_micro {
+project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba {
   after += *idl
   source_files {
     server.cpp
diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
index 42bcc38ae52..0f033447a3f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : taoserver, avoids_minimum_corba, avoids_corba_e_micro {
+project : taoserver, avoids_minimum_corba {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index b6dc8f45585..913ba5162ba 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, avoids_corba_e_micro, pi {
+project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, pi {
   exename = server_main
   idlflags += -GT
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
index d9c87c1d884..fd81da7b806 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.cpp
@@ -80,13 +80,11 @@ TAO_IFR_Service_Loader::create_object (CORBA::ORB_ptr orb,
                                        ACE_ENV_ARG_DECL_NOT_USED)
    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int result;
-
   // Initializes the IFR_Service Service. Returns -1
   // on an error.
-  result = this->ifr_server_.init_with_orb (argc,
-                                            argv,
-                                            orb);
+  int result = this->ifr_server_.init_with_orb (argc,
+                                                argv,
+                                                orb);
   if (result != 0)
     {
       ACE_THROW_RETURN (CORBA::BAD_PARAM (0,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
index 804e235f797..721359a0343 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,11 +1,9 @@
 #include "orbsvcs/PortableGroup/GOA.h"
 
-
 ACE_RCSID (PortableGroup,
            GOA,
            "$Id$")
 
-
 #include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
 #include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"