ChangeLogTag:Sun Nov 16 23:14:45 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu>

3 files changed, 11 insertions, 11 deletions

diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 4bfbb1b47c0..6a8a7639efe 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -1250,7 +1250,7 @@ be_array::tc_encap_len (void)
                       "be_array::tc_encap_len - bad base type\n"));
           return 0;
         }
-      this->encap_len_ += bt->tc_encap_len ();
+      this->encap_len_ += bt->tc_size ();
       this->encap_len_ += 4; // to hold the array size
 
     }
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index b2971c9d724..5218a6df642 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -1392,7 +1392,7 @@ be_sequence::tc_encap_len (void)
                       "be_sequence::tc_encap_len - bad base type\n"));
           return 0;
         }
-      this->encap_len_ += bt->tc_encap_len ();
+      this->encap_len_ += bt->tc_size ();
       this->encap_len_ += 4; // to hold the max size
 
     }
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index f5377120dd4..c55aa2f3738 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -230,14 +230,6 @@ be_typedef::gen_typecode (void)
   return 0;
 }
 
-long
-be_typedef::tc_size (void)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation length
-  return 4 + 4 + this->tc_encap_len ();
-}
-
 // generate encapsulation. A typedef is an alias to its base type
 int
 be_typedef::gen_encapsulation  (void)
@@ -283,6 +275,14 @@ be_typedef::gen_encapsulation  (void)
 }
 
 long
+be_typedef::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+long
 be_typedef::tc_encap_len (void)
 {
   if (this->encap_len_ == -1) // not computed yet
@@ -303,7 +303,7 @@ be_typedef::tc_encap_len (void)
               "be_typedef::tc_encap_len - bad base type\n"));
           return 0;
         }
-      this->encap_len_ += bt->tc_encap_len ();
+      this->encap_len_ += bt->tc_size ();
 
     }
   return this->encap_len_;