1 files changed, 16 insertions, 42 deletions

diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
index 02bd740e22c..dad4e618c22 100644
--- a/TAO/tao/TimeBaseC.i
+++ b/TAO/tao/TimeBaseC.i
@@ -15,13 +15,19 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -29,19 +35,11 @@ CORBA::Boolean operator<< (
     const TimeBase::UtcT &_tao_aggregate
   )
 {
-  if (
+  return
     (strm << _tao_aggregate.time) &&
     (strm << _tao_aggregate.inacclo) &&
     (strm << _tao_aggregate.inacchi) &&
-    (strm << _tao_aggregate.tdf)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm << _tao_aggregate.tdf);
 }
 
 ACE_INLINE
@@ -50,23 +48,15 @@ CORBA::Boolean operator>> (
     TimeBase::UtcT &_tao_aggregate
   )
 {
-  if (
+  return
     (strm >> _tao_aggregate.time) &&
     (strm >> _tao_aggregate.inacclo) &&
     (strm >> _tao_aggregate.inacchi) &&
-    (strm >> _tao_aggregate.tdf)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm >> _tao_aggregate.tdf);
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -74,17 +64,9 @@ CORBA::Boolean operator<< (
     const TimeBase::IntervalT &_tao_aggregate
   )
 {
-  if (
+  return
     (strm << _tao_aggregate.lower_bound) &&
-    (strm << _tao_aggregate.upper_bound)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm << _tao_aggregate.upper_bound);
 }
 
 ACE_INLINE
@@ -93,16 +75,8 @@ CORBA::Boolean operator>> (
     TimeBase::IntervalT &_tao_aggregate
   )
 {
-  if (
+  return
     (strm >> _tao_aggregate.lower_bound) &&
-    (strm >> _tao_aggregate.upper_bound)
-   )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    (strm >> _tao_aggregate.upper_bound);
 }