ChangeLogTag: Sat Apr 12 02:52:03 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

22 files changed, 149 insertions, 108 deletions

diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 34cc8288f19..ebddf8c0e55 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,38 @@
+Sat Apr 12 02:52:03 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_type.cpp:
+        * TAO_IDL/be/be_valuetype.cpp:
+        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO_IDL/be_include/be_type.h:
+        * TAO_IDL/be_include/be_valuetype.h:
+
+	  Fixed errors in generated code for exception holders
+	  and reply/response handlers.
+
+        * tests/AMH_Exceptions/client.dsp:
+        * tests/AMH_Exceptions/server.dsp:
+        * tests/AMH_Oneway/client.dsp:
+        * tests/AMH_Oneway/server.dsp:
+        * tests/AMI/AMI_Test_Client.dsp:
+        * tests/AMI/AMI_Test_Server.dsp:
+        * tests/AMI_Timeouts/client.dsp:
+        * tests/AMI_Timeouts/server.dsp:
+        * tests/OBV/Factory/client.dsp:
+        * tests/OBV/Factory/server.dsp:
+        * tests/OBV/Forward/client.dsp:
+        * tests/OBV/Forward/server.dsp:
+
+	  Removed obsolete -Gv option from IDL compiler
+	  command lines for the above tests.
+
+        * tests/OBV/Forward/client.cpp:
+
+	  Changed instances of <valuetype>_ptr to
+	  <valuetype> *.
+
 Fri Apr 11 21:50:43 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_array/array_ch.cpp:
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 22a1d0f9ea0..83186208a91 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -51,35 +51,10 @@ be_type::be_type (AST_Decl::NodeType nt,
     common_varout_gen_ (I_FALSE),
     seen_in_sequence_ (I_FALSE)
 {
-  AST_Decl *parent = ScopeAsDecl (this->defined_in ());
-  Identifier *segment = 0;
-  char *tmp = 0;
-
-  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
-    {
-      for (UTL_IdListActiveIterator i (parent->name ());
-           !i.is_done ();
-           i.next ())
-        {
-          segment = i.item ();
-          tmp = segment->get_string ();
-
-          if (ACE_OS::strcmp (tmp, "") == 0)
-            {
-              continue;
-            }
-
-          this->fwd_helper_name_ += tmp;
-          this->fwd_helper_name_ += "::";
-        }
-    }
-  else
+  if (n != 0) 
     {
-      this->fwd_helper_name_= "";
+      this->gen_fwd_helper_name ();
     }
-
-  this->fwd_helper_name_ += "tao_";
-  this->fwd_helper_name_ += this->local_name ()->get_string ();
 }
 
 be_type::~be_type (void)
@@ -215,6 +190,41 @@ be_type::nested_sp_type_name (be_decl *use_scope,
                             prefix);
 }
 
+void
+be_type::gen_fwd_helper_name (void)
+{
+  AST_Decl *parent = ScopeAsDecl (this->defined_in ());
+  Identifier *segment = 0;
+  char *tmp = 0;
+  this->fwd_helper_name_.clear (1);
+
+  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
+    {
+      for (UTL_IdListActiveIterator i (parent->name ());
+           !i.is_done ();
+           i.next ())
+        {
+          segment = i.item ();
+          tmp = segment->get_string ();
+
+          if (ACE_OS::strcmp (tmp, "") == 0)
+            {
+              continue;
+            }
+
+          this->fwd_helper_name_ += tmp;
+          this->fwd_helper_name_ += "::";
+        }
+    }
+  else
+    {
+      this->fwd_helper_name_= "";
+    }
+
+  this->fwd_helper_name_ += "tao_";
+  this->fwd_helper_name_ += this->local_name ()->get_string ();
+}
+
 const char *
 be_type::fwd_helper_name (void) const
 {
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index bc706967198..f7c860b205a 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -122,35 +122,10 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
         }
     }
 
-  AST_Decl *parent = ScopeAsDecl (this->defined_in ());
-  Identifier *segment = 0;
-  char *tmp = 0;
-
-  if (parent != 0 && parent->node_type () != AST_Decl::NT_root)
-    {
-      for (UTL_IdListActiveIterator i (parent->name ());
-           !i.is_done ();
-           i.next ())
-        {
-          segment = i.item ();
-          tmp = segment->get_string ();
-
-          if (ACE_OS::strcmp (tmp, "") == 0)
-            {
-              continue;
-            }
-
-          this->fwd_helper_name_ += tmp;
-          this->fwd_helper_name_ += "::";
-        }
-    }
-  else
+  if (n != 0 && this->fwd_helper_name_ == "") 
     {
-      this->fwd_helper_name_= "";
+      this->gen_fwd_helper_name ();
     }
-
-  this->fwd_helper_name_ += "tao_";
-  this->fwd_helper_name_ += this->local_name ();
 }
 
 be_valuetype::~be_valuetype (void)
@@ -306,9 +281,14 @@ be_valuetype:: gen_var_out_seq_decls (void)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  // Generate the ifdefined macro for this interface.
+  os->gen_ifdef_macro (this->flat_name (),
+                       "odds_n_ends");
+
   const char *lname = this->local_name ();
 
-  *os << "class " << lname << ";" << be_nl
+  *os << be_nl << be_nl
+      << "class " << lname << ";" << be_nl
       << "struct tao_" << lname << "_life;" << be_nl << be_nl
       << "typedef" << be_idt_nl
       << "TAO_Value_Var_T<" << be_idt << be_idt_nl
@@ -332,6 +312,8 @@ be_valuetype:: gen_var_out_seq_decls (void)
       << "static void tao_remove_ref (" << lname << " *);" << be_uidt_nl
       << "};";
 
+  os->gen_endif ();
+
   this->var_out_seq_decls_gen_ = 1;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 9b5aa0ad019..24ab9029bd8 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -169,6 +169,7 @@ be_visitor_amh_pre_proc::create_response_handler (
   response_handler->set_imported (node->imported ());
   response_handler->set_line (node->line ());
   response_handler->set_file_name (node->file_name ());
+  response_handler->gen_fwd_helper_name ();
 
   this->add_rh_node_members (node, response_handler, exception_holder);
 
@@ -638,6 +639,8 @@ be_visitor_amh_pre_proc::create_exception_holder (be_interface *node)
                   0);
 
   excep_holder->set_name (excep_holder_name);
+  excep_holder->set_defined_in (node->defined_in ());
+  excep_holder->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
   // add now the operations and attributes to the scope.
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index 765e5c5d427..3f68429afd7 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -501,6 +501,8 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   0);
 
   reply_handler->set_name (reply_handler_name);
+  reply_handler->set_defined_in (node->defined_in ());
+  reply_handler->gen_fwd_helper_name ();
 
   // Now our customized valuetype is created, we have to
   // add now the operations and attributes to the scope.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 57fc57ca8a3..93dd7a643e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -60,11 +60,13 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << be_nl << be_nl
       << "int " << node->full_name () << "::_tao_class_id = 0;";
 
+  const char *fhname = node->fwd_helper_name ();
+
   // Helper functions generated in case this interface was
   // forward declared in some other IDL file and not defined there.
   *os << be_nl << be_nl
       << node->full_name () << "_ptr" << be_nl
-      << node->fwd_helper_name () << "_life::"
+      << fhname << "_life::"
       << "tao_duplicate (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -75,7 +77,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << "void" << be_nl
-      << node->fwd_helper_name () << "_life::"
+      << fhname << "_life::"
       << "tao_release (" << be_idt << be_idt_nl
       << node->full_name () << "_ptr p" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -85,7 +87,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << node->full_name () <<  "_ptr" << be_nl
-      << node->fwd_helper_name () << "_life::"
+      << fhname << "_life::"
       << "tao_nil (" << be_idt << be_idt_nl
       << "void" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -96,7 +98,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << "CORBA::Boolean" << be_nl
-      << node->fwd_helper_name () << "_life::"
+      << fhname << "_life::"
       << "tao_marshal (" << be_idt << be_idt_nl
       << node->name () << "_ptr p," << be_nl
       << "TAO_OutputCDR &cdr" << be_uidt_nl
@@ -109,7 +111,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << be_nl << be_nl
           << node->full_name () << "_ptr" << be_nl
-          << node->fwd_helper_name () << "_cast::"
+          << fhname << "_cast::"
           << "tao_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object *p" << be_nl
           << "ACE_ENV_ARG_DECL" << be_uidt_nl
@@ -122,7 +124,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
       *os << be_nl << be_nl
           << "CORBA::Object *" << be_nl
-          << node->fwd_helper_name () << "_cast::"
+          << fhname << "_cast::"
           << "tao_upcast (" << be_idt << be_idt_nl
           << "void *src" << be_uidt_nl
           << ")" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index c6cb3f4663e..451e98be5d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -93,10 +93,18 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
+  const char *fhname = node->fwd_helper_name ();
+
+  if (ACE_OS::strcmp (fhname, "") == 0)
+    {
+      node->gen_fwd_helper_name ();
+      fhname = node->fwd_helper_name ();
+    }
+
   // Helper functions to allow non-defined forward declared valuetypes
   // access to some methods in the full definition.
   *os << "void" << be_nl
-      << node->fwd_helper_name () << "_life::tao_add_ref (" 
+      << fhname << "_life::tao_add_ref (" 
       << be_idt << be_idt_nl
       << node->full_name () << " * p" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -105,7 +113,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "}" << be_nl << be_nl;
 
   *os << "void" << be_nl
-      << node->fwd_helper_name () << "_life::tao_remove_ref (" 
+      << fhname << "_life::tao_remove_ref (" 
       << be_idt << be_idt_nl
        << node->full_name () << " * p" << be_uidt_nl
       << ")" << be_uidt_nl
@@ -118,23 +126,23 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << "template class" << be_idt_nl
       << "TAO_Value_Var_T<" << be_idt << be_idt_nl
       << node->name () << "," << be_nl
-      << node->fwd_helper_name () << "_life" << be_uidt_nl
+      << fhname << "_life" << be_uidt_nl
       << ">;" << be_uidt << be_uidt_nl
       << "template class" << be_idt_nl
       << "TAO_Value_Out_T<" << be_idt << be_idt_nl
       << node->name () << "," << be_nl
-      << node->fwd_helper_name () << "_life" << be_uidt_nl
+      << fhname << "_life" << be_uidt_nl
       << ">;" << be_uidt << be_uidt << be_uidt_nl
       << "#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)" << be_nl
       << "# pragma instantiate \\" << be_idt << be_idt_nl
       << "TAO_Value_Var_T< \\" << be_idt << be_idt_nl
       << node->name () << ", \\" << be_nl
-      << node->fwd_helper_name () << "_life \\" << be_uidt_nl
+      << fhname << "_life \\" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt_nl
       << "# pragma instantiate \\" << be_idt << be_idt_nl
       << "TAO_Value_Out_T< \\" << be_idt << be_idt_nl
       << node->name () << ", \\" << be_nl
-      << node->fwd_helper_name () << "_life \\" << be_uidt_nl
+      << fhname << "_life \\" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt_nl
       << "#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */";
 
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index cd653c08bca..a73d51f21da 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -54,6 +54,8 @@ public:
   // Type name of a node used when generating declarations for smart
   // proxies.
 
+  void gen_fwd_helper_name (void);
+
   const char *fwd_helper_name (void) const;
   // Accessor to the member.
 
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index 5b7c2f4fdfd..35117f3694d 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -155,9 +155,6 @@ private:
 
   int var_out_seq_decls_gen_;
   // Have these been done already?
-
-  ACE_CString fwd_helper_name_;
-  // Calculate this in one place.
 };
 
 #endif  // if !defined
diff --git a/TAO/tests/AMH_Exceptions/client.dsp b/TAO/tests/AMH_Exceptions/client.dsp
index 2bf938883b4..929ed4bc8f9 100644
--- a/TAO/tests/AMH_Exceptions/client.dsp
+++ b/TAO/tests/AMH_Exceptions/client.dsp
@@ -123,7 +123,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GH  $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -161,7 +161,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Gv  -GH -Ge 1 $(InputName).idl

+	..\..\..\bin\tao_idl -GH -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Exceptions/server.dsp b/TAO/tests/AMH_Exceptions/server.dsp
index fde408f4d5f..8468f6f3743 100644
--- a/TAO/tests/AMH_Exceptions/server.dsp
+++ b/TAO/tests/AMH_Exceptions/server.dsp
@@ -127,7 +127,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -GV -GH $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,7 +165,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv  -GH $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Oneway/client.dsp b/TAO/tests/AMH_Oneway/client.dsp
index 24c8ea3f008..8889073fae6 100644
--- a/TAO/tests/AMH_Oneway/client.dsp
+++ b/TAO/tests/AMH_Oneway/client.dsp
@@ -119,7 +119,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GH  $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH  $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -157,7 +157,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Gv  -GH -Ge 1 $(InputName).idl

+	..\..\..\bin\tao_idl -GH -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMH_Oneway/server.dsp b/TAO/tests/AMH_Oneway/server.dsp
index ae6f7ffb721..34fe8191d7d 100644
--- a/TAO/tests/AMH_Oneway/server.dsp
+++ b/TAO/tests/AMH_Oneway/server.dsp
@@ -127,7 +127,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -GV -GH $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -165,7 +165,7 @@ InputPath=.\Test.idl
 InputName=Test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv  -GH $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GH $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI/AMI_Test_Client.dsp b/TAO/tests/AMI/AMI_Test_Client.dsp
index 25f4f4c0a24..188468afec8 100644
--- a/TAO/tests/AMI/AMI_Test_Client.dsp
+++ b/TAO/tests/AMI/AMI_Test_Client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -167,7 +167,7 @@ InputPath=.\ami_test.idl
 InputName=ami_test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -GC -Gv $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI/AMI_Test_Server.dsp b/TAO/tests/AMI/AMI_Test_Server.dsp
index 0fa401a825d..10e6f9de836 100644
--- a/TAO/tests/AMI/AMI_Test_Server.dsp
+++ b/TAO/tests/AMI/AMI_Test_Server.dsp
@@ -183,7 +183,7 @@ InputPath=.\ami_test.idl
 InputName=ami_test

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI_Timeouts/client.dsp b/TAO/tests/AMI_Timeouts/client.dsp
index f51d8b90304..266f860b13b 100644
--- a/TAO/tests/AMI_Timeouts/client.dsp
+++ b/TAO/tests/AMI_Timeouts/client.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -156,7 +156,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -194,7 +194,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/AMI_Timeouts/server.dsp b/TAO/tests/AMI_Timeouts/server.dsp
index 3bd110c9bcb..16abc9748ec 100644
--- a/TAO/tests/AMI_Timeouts/server.dsp
+++ b/TAO/tests/AMI_Timeouts/server.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR- /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GR- /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -152,7 +152,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -190,7 +190,7 @@ InputPath=.\timeout.idl
 InputName=timeout

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -Ge 1 -Gv -GC $(InputName).idl

+	..\..\..\bin\tao_idl -Ge 1 -GC $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Factory/client.dsp b/TAO/tests/OBV/Factory/client.dsp
index 0aad3130622..63f3f7f743e 100644
--- a/TAO/tests/OBV/Factory/client.dsp
+++ b/TAO/tests/OBV/Factory/client.dsp
@@ -129,7 +129,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -167,7 +167,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Factory/server.dsp b/TAO/tests/OBV/Factory/server.dsp
index 850e9146b85..f2e080e3b2e 100644
--- a/TAO/tests/OBV/Factory/server.dsp
+++ b/TAO/tests/OBV/Factory/server.dsp
@@ -137,7 +137,7 @@ InputPath=.\Factory.idl
 InputName=Factory

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b71178be956..aa7f0782728 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 void
-dump_node (BaseNode_ptr bn, int indent)
+dump_node (BaseNode *bn, int indent)
 {
   if (bn == 0) return;
 
@@ -46,7 +46,7 @@ dump_node (BaseNode_ptr bn, int indent)
   int i = indent;
   for (; i != 0; i--) ACE_DEBUG ((LM_DEBUG, "  "));
 
-  StringNode_ptr sn = StringNode::_downcast (bn);
+  StringNode *sn = StringNode::_downcast (bn);
   if (sn != 0)
   {
     ACE_DEBUG ((LM_DEBUG, "%x <StringNode> %s\n",
@@ -65,7 +65,7 @@ dump_node (BaseNode_ptr bn, int indent)
 }
 
 void
-dump_tree (TreeController_ptr tc)
+dump_tree (TreeController *tc)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) start tree dump <%x>\n",
diff --git a/TAO/tests/OBV/Forward/client.dsp b/TAO/tests/OBV/Forward/client.dsp
index c5bf897ff7b..a4055663d79 100644
--- a/TAO/tests/OBV/Forward/client.dsp
+++ b/TAO/tests/OBV/Forward/client.dsp
@@ -139,7 +139,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -177,7 +177,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -223,7 +223,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -261,7 +261,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -307,7 +307,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -345,7 +345,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/OBV/Forward/server.dsp b/TAO/tests/OBV/Forward/server.dsp
index 7fc21bdaeba..9d6a5f60929 100644
--- a/TAO/tests/OBV/Forward/server.dsp
+++ b/TAO/tests/OBV/Forward/server.dsp
@@ -169,7 +169,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -208,7 +208,7 @@ InputPath=.\TreeBase.idl
 InputName=TreeBase

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -252,7 +252,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "f$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -291,7 +291,7 @@ InputPath=.\TreeController.idl
 InputName=TreeController

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -335,7 +335,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -374,7 +374,7 @@ InputPath=.\TreeNode.idl
 InputName=TreeNode

 

 BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gv -Ge 1 $(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)