summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog-98c11
-rw-r--r--TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp4
2 files changed, 13 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 89aea893fb2..6218a804c19 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,14 @@
+Fri Jan 01 02:45:18 1999 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * TAO_IDL/be/be_visitor_array/array_ci.cpp (gen_forany_impl and
+ gen_var_impl): There is no cast required for assigning a pointer
+ to zero. Thanks to Patrice Bensoussan <pbensoussan@amadeus.net>
+ for reporting this bug.
+
+ * Active_Object_Map.i: Rearranged functions to remove "redeclared
+ inline after being called" warnings. Thanks to David for
+ pointing these out.
+
Thu Dec 31 16:28:27 1998 Nanbor Wang <nanbor@cs.wustl.edu>
* TAO_IDL/tao_idl.dsp:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index e664de6ac60..a37189b28c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -228,7 +228,7 @@ be_visitor_array_ci::gen_var_impl (be_array *node)
*os << "ACE_INLINE" << be_nl;
*os << fname << "::" << lname <<
" (void) // default constructor" << be_nl;
- *os << " " << ": ptr_ ((" << nodename << "_slice *)0)" << be_nl;
+ *os << " " << ": ptr_ (0)" << be_nl;
*os << "{}\n\n";
// constr from a _slice *
@@ -555,7 +555,7 @@ be_visitor_array_ci::gen_forany_impl (be_array *node)
*os << "ACE_INLINE" << be_nl;
*os << fname << "::" << lname <<
" (void) // default constructor" << be_nl;
- *os << " " << ": ptr_ ((" << nodename << "_slice *)0)," << be_nl;
+ *os << " " << ": ptr_ (0)," << be_nl;
*os << " nocopy_ (0)" << be_nl;
*os << "{}\n\n";