ChangeLogTag:Tue Feb 9 16:39:27 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

11 files changed, 14 insertions, 13 deletions

diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index 7df2ceba775..e53c4b51566 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -419,9 +419,9 @@ be_decl::prefix (void)
 
 // converts a string name into an array of 4 byte longs
 int
-be_decl::tc_name2long (const char *name, long *&larr, long &arrlen)
+be_decl::tc_name2long (const char *name, ACE_UINT32 *&larr, long &arrlen)
 {
-  static long buf [NAMEBUFSIZE / sizeof (long)];
+  static ACE_UINT32 buf [NAMEBUFSIZE / sizeof (long)];
   long slen;
   long i;
 
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 176be9bf235..e80f8704cf0 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -110,7 +110,6 @@ be_enum::gen_encapsulation (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
 
 
   cs = cg->client_stubs ();
@@ -119,6 +118,8 @@ be_enum::gen_encapsulation (void)
   *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
   // generate repoID
   *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+
+  ACE_UINT32 *arr;
   (void)this->tc_name2long (this->repoID (), arr, arrlen);
   for (i=0; i < arrlen; i++)
     {
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 995af70cd31..3a52a779278 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -45,7 +45,7 @@ be_enum_val::gen_encapsulation (void)
   TAO_OutStream *cs; // output stream
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
 
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index 744cbf9cc40..9a3a6ad0f27 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -110,8 +110,8 @@ be_exception::gen_encapsulation (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
-
+  ACE_UINT32 *arr;
+  
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at
 
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index 72fbde2a82f..60844f6898a 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -44,7 +44,7 @@ be_field::gen_encapsulation (void)
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   be_type *bt;  // our type node
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
 
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index e275183c5e5..a5b2e35f4d7 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -830,7 +830,7 @@ be_interface::gen_encapsulation (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
 
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index ebc59e9593d..4ca417ca519 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -397,7 +397,7 @@ be_predefined_type::gen_encapsulation (void)
       TAO_NL  nl;        // end line
       TAO_CodeGen *cg = TAO_CODEGEN::instance ();
       long i, arrlen;
-      long *arr;  // an array holding string names converted to array of longs
+      ACE_UINT32 *arr;
 
       cs = cg->client_stubs ();
       cs->indent (); // start from whatever indentation level we were at
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 9530cb1e279..3073c59e1f3 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -602,7 +602,7 @@ be_structure::gen_encapsulation (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
 
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 0fa4f180967..f07db98f150 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -85,7 +85,7 @@ be_typedef::gen_encapsulation  (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
   be_type *bt; // base type
 
   cs = cg->client_stubs ();
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 18f5e37e60c..6a07d15fd6a 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -647,7 +647,7 @@ be_union::gen_encapsulation (void)
   TAO_NL  nl;        // end line
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
   be_type *discrim;
 
   cs = cg->client_stubs ();
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index 11a5e4ac0dc..e1ea7eabf91 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -49,7 +49,7 @@ be_union_branch::gen_encapsulation (void)
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
   be_type *bt;  // our type node
   long i, arrlen;
-  long *arr;  // an array holding string names converted to array of longs
+  ACE_UINT32 *arr;
 
   cs = cg->client_stubs ();
   cs->indent (); // start from whatever indentation level we were at