ChangeLogTag: Fri Aug 29 14:16:18 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 48 insertions, 27 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ae09f6068d2..16d74b7d7e5 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Fri Aug 29 14:16:18 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/ast/ast_generator.cpp:
+        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/include/ast_generator.h:
+
+          Removed AST_Generator::create_expr (unsigned long), and
+          replaced its remaining uses with the version taking
+          ACE_UINT64 and AST_Expression::ExprType, which has subsumed
+          its function. This change should eliminate a problem
+          BCB has disambiguating AST_Generator::create_expr (unsigned long)
+          and be_generator::create_expr (UTL_IdList *) in the derived
+          class.
+
 Fri Aug 29 11:07:45 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/examples/CosEC/TypedSimple/CosEC_TypedSimple.mpc:
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 25e89918a47..bc5b623b8da 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -711,17 +711,6 @@ AST_Generator::create_expr (long v,
 }
 
 AST_Expression *
-AST_Generator::create_expr (unsigned long v)
-{
-  AST_Expression *retval = 0;
-  ACE_NEW_RETURN (retval,
-                  AST_Expression (v),
-                  0);
-
-  return retval;
-}
-
-AST_Expression *
 AST_Generator::create_expr (ACE_UINT64 v,
                             AST_Expression::ExprType t)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index d12e32f2a95..1b79626288c 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -1534,14 +1534,22 @@ be_visitor_ccm_pre_proc::create_uses_multiple_sequence (
     AST_Component::port_description *pd
   )
 {
-  unsigned long bound = 0;
-  ACE_NEW_RETURN (this->connections_,
-                  be_sequence (idl_global->gen ()->create_expr (bound),
-                               this->connection_,
-                               0,
-                               0,
-                               0),
-                  -1);
+  ACE_UINT64 bound = 0;
+  ACE_NEW_RETURN (
+      this->connections_,
+      be_sequence (
+          idl_global->gen ()->create_expr (
+                                  bound,
+                                  AST_Expression::EV_ulong
+                                ),
+          this->connection_,
+          0,
+          0,
+          0
+        ),
+      -1
+    );
+
   ACE_CString base_name (pd->id->get_string (),
                          0,
                          0);
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 7c28c47933f..911837592d5 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -3023,7 +3023,10 @@ sequence_type_spec
 
                   $$ =
                     idl_global->gen ()->create_sequence (
-                        idl_global->gen ()->create_expr ((unsigned long) 0),
+                        idl_global->gen ()->create_expr (
+                                                (ACE_UINT64) 0,
+                                                AST_Expression::EV_ulong
+                                              ),
                         tp,
                         &sn,
                         s->is_local (),
@@ -3107,7 +3110,8 @@ string_type_spec
            */
           $$ =
             idl_global->gen ()->create_string (
-                idl_global->gen ()->create_expr ((unsigned long) 0)
+                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                                                 AST_Expression::EV_ulong)
               );
           /*
            * Add this AST_String to the types defined in the global scope.
@@ -3176,7 +3180,8 @@ wstring_type_spec
            */
           $$ =
             idl_global->gen ()->create_wstring (
-                idl_global->gen ()->create_expr ((unsigned long) 0)
+                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                                                 AST_Expression::EV_ulong)
               );
           /*
            * Add this AST_String to the types defined in the global scope.
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 1dcc6f85b9d..0b8ae45ff1e 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -5081,7 +5081,10 @@ tao_yyreduce:
 
                   tao_yyval.dcval =
                     idl_global->gen ()->create_sequence (
-                        idl_global->gen ()->create_expr ((unsigned long) 0),
+                        idl_global->gen ()->create_expr (
+                                                (ACE_UINT64) 0,
+                                                AST_Expression::EV_ulong
+                                              ),
                         tp,
                         &sn,
                         s->is_local (),
@@ -5179,7 +5182,8 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_string (
-                idl_global->gen ()->create_expr ((unsigned long) 0)
+                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                                                 AST_Expression::EV_ulong)
               );
           /*
            * Add this AST_String to the types defined in the global scope.
@@ -5256,7 +5260,8 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_wstring (
-                idl_global->gen ()->create_expr ((unsigned long) 0)
+                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                                                 AST_Expression::EV_ulong)
               );
           /*
            * Add this AST_String to the types defined in the global scope.
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 988b4b7f62b..173646c09fa 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -283,8 +283,6 @@ public:
   virtual AST_Expression *create_expr (long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr (unsigned long v);
-
   virtual AST_Expression *create_expr (ACE_UINT64 v,
                                        AST_Expression::ExprType t);