ChangeLogTag: Wed Aug 28 14:55:43 2002 Jeff Parsons <parsons@cs.wustl.edu>

6 files changed, 110 insertions, 77 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0be68c97375..1b01fe9a9e9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,24 @@
+Wed Aug 28 14:55:43 2002  Jeff Parsons <parsons@cs.wustl.edu>
+
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+
+          Took away the checks for 'local' that guarded generation
+          of CDR and Any operators. I thought these had been 
+          removed before, but somehow they crept back in. Thanks
+          to Irfan <irfan@oomworks.com> for pointing it out.
+
+        * TAO_IDL/driver/drv_preproc.cpp:
+
+          Fixed a signed/unsigned comparison warning that popped
+          up because of a change in ACE.
+
+        * orbsvcs/IFR_Service/drv_preproc_ifr.cpp:
+
+          Fixed a signed/unsigned comparison warning that popped
+          up because of a change in ACE.          
+
 Wed Aug 28 06:06:12 UTC 2002  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/Invocation.h:
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 2f4284fd450..fab36229f79 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -50,75 +50,85 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
   *os << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  if (!node->is_local ())
-    {
-      // Generate the Any <<= and >>= operator declarations
-      // Any <<= and >>= operators.
-      *os << "void" << be_nl
-          << "operator<<= (" << be_idt << be_idt_nl
-          << "CORBA::Any &_tao_any," << be_nl
-          << node->full_name () << "_ptr _tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "TAO_OutputCDR stream;" << be_nl
-          << "if (stream << _tao_elem)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "_tao_any._tao_replace (" << be_idt << be_idt_nl
-          << node->tc_name () << ", " << be_nl
-          << "TAO_ENCAP_BYTE_ORDER," << be_nl
-          << "stream.begin ()," << be_nl
-          << "1," << be_nl
-          << node->full_name () << "::_duplicate (_tao_elem)," << be_nl
-          << node->name () << "::_tao_any_destructor" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl
-          << "}" << be_nl << be_nl;
-
-      *os << "CORBA::Boolean" << be_nl
-          << "operator>>= (" << be_idt << be_idt_nl
-          << "const CORBA::Any &_tao_any," << be_nl
-          << node->full_name () << "_ptr &_tao_elem" << be_uidt_nl
-          << ")" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "ACE_TRY_NEW_ENV" << be_nl
-          << "{" << be_idt_nl
-          << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
-          << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
-          << "CORBA::Boolean result =" << be_idt_nl
-          << "type->equivalent (" << be_idt << be_idt_nl
-          << node->tc_name () << be_nl
-          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
-          << ");" << be_uidt << be_uidt_nl
-          << "ACE_TRY_CHECK;" << be_nl << be_nl
-          << "if (!result)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "return 0; // not equivalent" << be_uidt_nl 
-          << "}" << be_uidt_nl << be_nl
-          << "TAO_InputCDR stream (" << be_idt << be_idt_nl
-          << "_tao_any._tao_get_cdr ()," << be_nl
-          << "_tao_any._tao_byte_order ()" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl
-          << "if (stream >> _tao_elem)" << be_idt_nl
-          << "{" << be_idt_nl
-          << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl
-          << node->tc_name () << "," << be_nl
-          << "1," << be_nl
-          << "_tao_elem," << be_nl
-          << node->name () << "::_tao_any_destructor" << be_uidt_nl
-          << ");" << be_uidt_nl << be_nl
-          << "return 1;" << be_uidt_nl
-          << "}" << be_uidt << be_uidt_nl
-          << "}" << be_nl
-          << "ACE_CATCHANY" << be_nl
-          << "{" << be_idt_nl
-          << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
-          << "return 0;" << be_uidt_nl
-          << "}" << be_nl
-          << "ACE_ENDTRY;" << be_nl
-          << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
-          << "return 0;" << be_uidt_nl
-          << "}" << be_nl << be_nl;
-    }
+  // Generate the Any <<= and >>= operator declarations
+  // Any <<= and >>= operators.
+  *os << "// Copying version." << be_nl
+      << "void" << be_nl
+      << "operator<<= (" << be_idt << be_idt_nl
+      << "CORBA::Any &_tao_any," << be_nl
+      << node->full_name () << "_ptr _tao_elem" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << node->full_name () << "_ptr _tao_objptr =" << be_idt_nl
+      << node->full_name () << "::_duplicate (_tao_elem);" << be_uidt_nl
+      << "_tao_any <<= &_tao_objptr;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "// Non-copying version." << be_nl
+      << "void" << be_nl
+      << "operator<<= (" << be_idt << be_idt_nl
+      << "CORBA::Any &_tao_any," << be_nl
+      << node->full_name () << "_ptr *_tao_elem" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "TAO_OutputCDR stream;" << be_nl << be_nl
+      << "if (stream << *_tao_elem)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "_tao_any._tao_replace (" << be_idt << be_idt_nl
+      << node->tc_name () << ", " << be_nl
+      << "TAO_ENCAP_BYTE_ORDER," << be_nl
+      << "stream.begin ()," << be_nl
+      << "1," << be_nl
+      << "*_tao_elem," << be_nl
+      << node->name () << "::_tao_any_destructor" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
+  *os << "CORBA::Boolean" << be_nl
+      << "operator>>= (" << be_idt << be_idt_nl
+      << "const CORBA::Any &_tao_any," << be_nl
+      << node->full_name () << "_ptr &_tao_elem" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "ACE_TRY_NEW_ENV" << be_nl
+      << "{" << be_idt_nl
+      << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
+      << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl << be_nl
+      << "CORBA::Boolean result =" << be_idt_nl
+      << "type->equivalent (" << be_idt << be_idt_nl
+      << node->tc_name () << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "ACE_TRY_CHECK;" << be_nl << be_nl
+      << "if (!result)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "return 0; // not equivalent" << be_uidt_nl 
+      << "}" << be_uidt_nl << be_nl
+      << "TAO_InputCDR stream (" << be_idt << be_idt_nl
+      << "_tao_any._tao_get_cdr ()," << be_nl
+      << "_tao_any._tao_byte_order ()" << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl
+      << "if (stream >> _tao_elem)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl
+      << node->tc_name () << "," << be_nl
+      << "1," << be_nl
+      << "_tao_elem," << be_nl
+      << node->name () << "::_tao_any_destructor" << be_uidt_nl
+      << ");" << be_uidt_nl << be_nl
+      << "return 1;" << be_uidt_nl
+      << "}" << be_uidt << be_uidt_nl
+      << "}" << be_nl
+      << "ACE_CATCHANY" << be_nl
+      << "{" << be_idt_nl
+      << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
+      << "return 0;" << be_uidt_nl
+      << "}" << be_nl
+      << "ACE_ENDTRY;" << be_nl
+      << "_tao_elem = " << node->full_name () << "::_nil ();" << be_nl
+      << "return 0;" << be_uidt_nl
+      << "}" << be_nl << be_nl;
 
   *os << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \\"
       << be_idt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index 22b6bd53d8a..85381fc666d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -42,7 +42,7 @@ int
 be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
 {
   // No CDR operations for locality constraint interfaces.
-  if (node->cli_hdr_cdr_op_gen () || node->imported () || node->is_local ())
+  if (node->cli_hdr_cdr_op_gen () || node->imported ())
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index b25161cd35a..6cbf960f30f 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -39,8 +39,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
   // No CDR operations for local interfaces.
   // already generated and/or we are imported. Don't do anything.
   if (node->cli_stub_cdr_op_gen ()
-      || node->imported ()
-      || node->is_local ())
+      || node->imported ())
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 44d31aaf9c4..9df7ea08a7a 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -316,7 +316,7 @@ DRV_cpp_init (void)
   // Add any flags in cpp_args to cpp's arglist.
   ACE_ARGV arglist (cpp_args);
 
-  for (size_t arg_cnt = 0; arg_cnt < arglist.argc (); ++arg_cnt)
+  for (size_t arg_cnt = 0; arg_cnt < (size_t)arglist.argc (); ++arg_cnt)
     {
       // Check for an argument that specifies the preprocessor's output file.
       if (ACE_OS::strstr (arglist[arg_cnt], "%s") != 0 
diff --git a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
index e0ec508601e..a49643c9c56 100644
--- a/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
+++ b/TAO/orbsvcs/IFR_Service/drv_preproc_ifr.cpp
@@ -66,12 +66,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // Pass an IDL file through the C preprocessor
 
+#include "drv_extern_ifr.h"
+#include "be_global.h"
+#include "be_extern.h"
+
 #include "idl_bool.h"
 #include "idl_defines.h"
 #include "global_extern.h"
 #include "fe_extern.h"
-#include "be_extern.h"
-#include "drv_extern_ifr.h"
 #include "utl_string.h"
 #include "ace/Process_Manager.h"
 #include "ace/SString.h"
@@ -266,10 +268,11 @@ DRV_cpp_init (void)
   // Add any flags in cpp_args to cpp's arglist.
   ACE_ARGV arglist (cpp_args);
 
-  for (size_t arg_cnt = 0; arg_cnt < arglist.argc (); ++arg_cnt)
+  for (size_t arg_cnt = 0; arg_cnt < (size_t)arglist.argc (); ++arg_cnt)
     {
       // Check for an argument that specifies the preprocessor's output file.
-      if (ACE_OS::strstr (arglist[arg_cnt], "%s") != 0 && output_arg_format == 0)
+      if (ACE_OS::strstr (arglist[arg_cnt], "%s") != 0 
+          && output_arg_format == 0)
         {
           output_arg_format = ACE::strnew (arglist[arg_cnt]);
           output_arg_index = argcount;