summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--TAO/ChangeLog-99c22
-rw-r--r--TAO/TAO_IDL/be/be_decl.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_enum.cpp3
-rw-r--r--TAO/TAO_IDL/be/be_enum_val.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_exception.cpp4
-rw-r--r--TAO/TAO_IDL/be/be_field.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_interface.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_predefined_type.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_structure.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_typedef.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_union.cpp2
-rw-r--r--TAO/TAO_IDL/be/be_union_branch.cpp2
-rw-r--r--TAO/TAO_IDL/be_include/be_decl.h2
-rw-r--r--TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp34
14 files changed, 58 insertions, 27 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 8f6e9417294..857e31a10f4 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,25 @@
+Tue Feb 9 16:39:27 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * TAO_IDL/be_include/be_decl.h:
+ * TAO_IDL/be/be_decl.cpp:
+ * TAO_IDL/be/be_enum.cpp:
+ * TAO_IDL/be/be_enum_val.cpp:
+ * TAO_IDL/be/be_exception.cpp:
+ * TAO_IDL/be/be_field.cpp:
+ * TAO_IDL/be/be_interface.cpp:
+ * TAO_IDL/be/be_predefined_type.cpp:
+ * TAO_IDL/be/be_structure.cpp:
+ * TAO_IDL/be/be_typedef.cpp:
+ * TAO_IDL/be/be_union.cpp:
+ * TAO_IDL/be/be_union_branch.cpp:
+ The name2long() function was using a <long> but it needed a
+ 32-bit type; the right type to use is a ACE_UINT32. This fixes
+ some strange problems in 64-bit machines, like Alphas.
+
+ * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+ Fixed the ACE_DEBUG calls, they should be protected by the
+ TAO_debug_level.
+
Tue Feb 9 13:47:37 1999 Balachandran Natarajan <bala@cs.wustl.edu>
* tao/try_macros.h:
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
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index c0aea715a22..46e64ee99df 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -147,7 +147,7 @@ protected:
virtual void compute_prefix (void);
// computes the prefix for the repoID
- virtual int tc_name2long (const char *name, long *&, long &);
+ virtual int tc_name2long (const char *name, ACE_UINT32 *&, long &);
// name represented as a padded array of longs
virtual long repoID_encap_len (void);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 9398d15d7d8..aca7367859c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -231,7 +231,8 @@ Cubit_Client::cube_union (void)
}
else
{
- ACE_DEBUG ((LM_DEBUG, "cube union ..."));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG, "cube union ..."));
u.l (u.l () * u.l () * u.l ()) ;
if (u.l () != r.l ())
@@ -269,7 +270,8 @@ Cubit_Client::cube_union (void)
}
else
{
- ACE_DEBUG ((LM_DEBUG, "cube union ..."));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG, "cube union ..."));
u.cm ().l = u.cm ().l * u.cm ().l * u.cm ().l;
u.cm ().s = u.cm ().s * u.cm ().s * u.cm ().s;
u.cm ().o = u.cm ().o * u.cm ().o * u.cm ().o;
@@ -308,10 +310,11 @@ Cubit_Client::cube_short (int i)
}
else
{
- ACE_DEBUG ((LM_DEBUG,
- "cube short: %d --> %d\n",
- arg_short,
- ret_short));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG,
+ "cube short: %d --> %d\n",
+ arg_short,
+ ret_short));
arg_short = arg_short * arg_short * arg_short;
if (arg_short != ret_short)
@@ -386,8 +389,10 @@ Cubit_Client::cube_octet (int i)
}
else
{
- ACE_DEBUG ((LM_DEBUG,
- "cube octet: %d --> %d\n", arg_octet, ret_octet));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG,
+ "cube octet: %d --> %d\n",
+ arg_octet, ret_octet));
arg_octet = arg_octet * arg_octet * arg_octet;
if (arg_octet != ret_octet) {
ACE_DEBUG ((LM_DEBUG,
@@ -423,9 +428,11 @@ Cubit_Client::cube_long (int i)
}
else
{
- ACE_DEBUG ((LM_DEBUG,
- "cube long: %d --> %d\n",
- arg_long, ret_long));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG,
+ "cube long: %d --> %d\n",
+ arg_long,
+ ret_long));
arg_long = arg_long * arg_long * arg_long;
if (arg_long != ret_long)
@@ -467,8 +474,9 @@ Cubit_Client::cube_struct (int i)
}
else
{
- ACE_DEBUG ((LM_DEBUG,
- "cube struct ..."));
+ if (TAO_debug_level > 2)
+ ACE_DEBUG ((LM_DEBUG,
+ "cube struct ..."));
arg_struct.l = arg_struct.l * arg_struct.l * arg_struct.l;
arg_struct.s = arg_struct.s * arg_struct.s * arg_struct.s;
arg_struct.o = arg_struct.o * arg_struct.o * arg_struct.o;
View Lorry Controller Status