7 files changed, 14 insertions, 14 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index d9aea38b55b..f4b78d3e14f 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -78,7 +78,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
 
       //  set the sub state as generating code for the output operator
       this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-      *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+      *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
           << "const " << node->name () << "_forany &_tao_array)" << be_nl
           << "{" << be_idt_nl;
 
@@ -95,7 +95,7 @@ be_visitor_array_cdr_op_cs::visit_array (be_array *node)
       //  set the sub state as generating code for the input operator
       os->indent ();
       this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-      *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+      *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
           << node->name () << "_forany &_tao_array)" << be_nl
           << "{" << be_idt_nl;
       if (bt->accept (this) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index 679bcf96ad8..13597bffca6 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -52,13 +52,13 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
 
   // generate CDR << and >> operators
   os->indent ();
-  *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+  *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
       << "const " << node->name () << " &_tao_enumval)" << be_nl
       << "{" << be_idt_nl
       << "return strm.write_ulong ((CORBA::ULong) _tao_enumval);" << be_uidt_nl
       << "}\n\n";
 
-  *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+  *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << " &_tao_enumval)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::ULong _tao_temp;" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index f9206190337..228d373fe06 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -52,7 +52,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
   //  set the sub state as generating code for the output operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+  *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
       << "const " << node->name () << " &_tao_aggregate)" << be_nl
       << "{" << be_idt_nl;
   // do we have any members?
@@ -95,7 +95,7 @@ be_visitor_exception_cdr_op_cs::visit_exception (be_exception *node)
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+  *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << " &_tao_aggregate)" << be_nl
       << "{" << be_idt_nl;
   // retrieve the repository ID and compare with what we have
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 8747394d3d2..0b046e455e3 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
@@ -52,7 +52,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   //  set the sub state as generating code for the output operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+  *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
       << "const " << node->name () << "_ptr _tao_objref)" << be_nl
       << "{" << be_idt_nl;
   // hand over the encoding to the TAO's internal engine
@@ -80,7 +80,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+  *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << "_ptr &_tao_objref)" << be_nl
       << "{" << be_idt_nl;
   // hand over to the TAO's internal marshaling engine
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 10d73d83b2d..033c259751a 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -78,7 +78,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
 
       //  set the sub state as generating code for the output operator
       this->ctx_->sub_state (TAO_CodeGen::TAO_CDR_OUTPUT);
-      *os << "CORBA::Boolean operator<< (" << be_idt << be_idt_nl
+      *os << "inline CORBA::Boolean operator<< (" << be_idt << be_idt_nl
 	  << "TAO_OutputCDR &strm," << be_nl
           << "const " << node->name ()
 	  << " &_tao_sequence" << be_uidt_nl
@@ -105,7 +105,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       //  set the sub state as generating code for the input operator
       os->indent ();
       this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-      *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+      *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
           << node->name () << " &_tao_sequence)" << be_nl
           << "{" << be_idt_nl;
       // first retrieve the length and adjust the sequence length accordingly
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index e2a4bceb19f..3f836c3e8a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -52,7 +52,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   //  set the sub state as generating code for the output operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+  *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
       << "const " << node->name () << " &_tao_aggregate)" << be_nl
       << "{" << be_idt_nl
       << "if (" << be_idt_nl;
@@ -74,7 +74,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+  *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << " &_tao_aggregate)" << be_nl
       << "{" << be_idt_nl
       << "if (" << be_idt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 7deb7d86e89..5ba0ef27a19 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -52,7 +52,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
 
   //  set the sub state as generating code for the output operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  *os << "CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+  *os << "inline CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
       << "const " << node->name () << " &_tao_union)" << be_nl
       << "{" << be_idt_nl
       << "return 1;" << be_uidt_nl
@@ -78,7 +78,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+  *os << "inline CORBA::Boolean operator>> (TAO_InputCDR &strm, "
       << node->name () << " &_tao_union)" << be_nl
       << "{" << be_idt_nl
       << "return 1;" << be_uidt_nl