ChangeLogTag: Tue Dec 14 14:55:00 2004 Greg Bostrom <greg.bostrom@hp.com>

16 files changed, 78 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7bd41ff5b17..f4100cd34f0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,30 @@
+Tue Dec 14 14:55:00 2004  Greg Bostrom <greg.bostrom@hp.com>
+
+        * TAO_IDL/include/idl_uns_long.h:
+
+          New file.
+          Define the idl_uns_long type to be either
+          'unsigned long long' or
+          'unsigned long'
+          depending upon what the platform will support.
+
+        * TAO_IDL/ast/ast_expression.cpp:
+        * TAO_IDL/ast/ast_generator.cpp:
+        * TAO_IDL/be/be_expression.cpp:
+        * TAO_IDL/be/be_generator.cpp:
+        * TAO_IDL/be_include/be_expression.h:
+        * TAO_IDL/be_include/be_generator.h:
+        * TAO_IDL/fe/idl.ll:
+        * TAO_IDL/fe/idl.yy:
+        * TAO_IDL/fe/lex.yy.cpp:
+        * TAO_IDL/fe/y.tab.cpp:
+        * TAO_IDL/fe/y.tab.h:
+        * TAO_IDL/include/ast_expression.h:
+        * TAO_IDL/include/ast_generator.h:
+        * TAO_IDL/util/utl_global.cpp:
+
+          Replace ACE_UINT64 definintions with the idl_uns_long type.
+
 Tue Dec 14 13:50:14 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * orbsvcs/orbsvcs/Notify/Admin.h:
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 4cd2bf8af20..e4efec3ac4c 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -237,7 +237,7 @@ AST_Expression::AST_Expression (unsigned long ulv)
 }
 
 // An AST_Expression denoting an unsigned long integer.
-AST_Expression::AST_Expression (ACE_UINT64 ulv,
+AST_Expression::AST_Expression (idl_uns_long ulv,
                                 ExprType t)
   : pd_ec (EC_none),
     pd_ev (0),
@@ -252,7 +252,11 @@ AST_Expression::AST_Expression (ACE_UINT64 ulv,
            AST_ExprValue);
 
   this->pd_ev->et = t;
+#if defined (ACE_LACKS_LONGLONG_T)
+  this->pd_ev->u.ulval = ulv;
+#else
   this->pd_ev->u.ullval = ulv;
+#endif
 }
 
 // An AST_Expression denoting a 32-bit floating point number.
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index aef8463440c..81765b7807f 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -705,7 +705,7 @@ AST_Generator::create_expr (long v,
 }
 
 AST_Expression *
-AST_Generator::create_expr (ACE_UINT64 v,
+AST_Generator::create_expr (idl_uns_long v,
                             AST_Expression::ExprType t)
 {
   AST_Expression *retval = 0;
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
index b7022962ee5..3c940b81abd 100644
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ b/TAO/TAO_IDL/be/be_expression.cpp
@@ -58,7 +58,7 @@ be_expression::be_expression (long l,
 {
 }
 
-be_expression::be_expression (ACE_UINT64 l,
+be_expression::be_expression (idl_uns_long l,
                               AST_Expression::ExprType t)
   : AST_Expression (l, 
                     t)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index fbba8bde07a..48f69771ec4 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -704,7 +704,7 @@ be_generator::create_expr (long l,
 }
 
 AST_Expression *
-be_generator::create_expr (ACE_UINT64 l,
+be_generator::create_expr (idl_uns_long l,
                            AST_Expression::ExprType t)
 {
   be_expression *retval = 0;
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index 4ebca2d7819..b5954dc8135 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -23,6 +23,7 @@
 #define BE_EXPRESSION_H
 
 #include "ast_expression.h"
+#include "idl_uns_long.h"
 
 class be_visitor;
 
@@ -44,7 +45,7 @@ public:
   be_expression (long l,
                  AST_Expression::ExprType t);
 
-  be_expression (ACE_UINT64 l,
+  be_expression (idl_uns_long l,
                  AST_Expression::ExprType t);
 
   be_expression (UTL_String *s);
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 4444a8999e6..1fdc96bd7f4 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -218,7 +218,7 @@ public:
   virtual AST_Expression *create_expr (long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr (ACE_UINT64 v,
+  virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr(UTL_String *s);
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index a7cb460ae90..9d487ce8e9d 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -67,6 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 1.1
  */
 
+#include "idl_uns_long.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -89,7 +90,7 @@ static ACE_CDR::WChar   idl_wchar_escape_reader (char *);
 static char             idl_escape_reader (char *);
 static double           idl_atof (char *);
 static long             idl_atoi (char *, long);
-static ACE_UINT64	idl_atoui (char *, long);
+static idl_uns_long     idl_atoui (char *, long);
 static void		idl_parse_line_and_file (char *);
 static void		idl_store_pragma (char *);
 static char *           idl_get_pragma_string (char *);
@@ -726,10 +727,10 @@ idl_atoi(char *s, long b)
 /*
  * idl_atoui - Convert a string of digits into an unsigned integer according to base b
  */
-static ACE_UINT64
+static idl_uns_long
 idl_atoui(char *s, long b)
 {
-  ACE_UINT64    r = 0;
+  idl_uns_long  r = 0;
 
   if (b == 8 && *s == '0')
     {
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 48c78b363d1..4dbb98248df 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -152,7 +152,7 @@ AST_Decl *tao_enum_constant_decl = 0;
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 38ac79e950e..83cba518d1f 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -863,6 +863,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 1.1
  */
 
+#include "idl_uns_long.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -886,7 +887,7 @@ static ACE_CDR::WChar   idl_wchar_escape_reader (char *);
 static char             idl_escape_reader (char *);
 static double           idl_atof (char *);
 static long             idl_atoi (char *, long);
-static ACE_UINT64       idl_atoui (char *, long);
+static idl_uns_long     idl_atoui (char *, long);
 static void             idl_parse_line_and_file (char *);
 static void             idl_store_pragma (char *);
 static char *           idl_get_pragma_string (char *);
@@ -2925,10 +2926,10 @@ idl_atoi(char *s, long b)
 /*
  * idl_atoui - Convert a string of digits into an unsigned integer according to base b
  */
-static ACE_UINT64
+static idl_uns_long
 idl_atoui(char *s, long b)
 {
-  ACE_UINT64    r = 0;
+  idl_uns_long  r = 0;
 
   if (b == 8 && *s == '0')
     {
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 66006ac3457..5808c651d75 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -307,7 +307,7 @@ typedef union TAO_YYSTYPE {
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
@@ -3694,6 +3694,7 @@ tao_yyreduce:
                     }
 
                   break;
+#if !defined (ACE_LACKS_LONGLONG_T)
                 case AST_Expression::EV_ulonglong:
                   if (ev->u.ullval == 0)
                     {
@@ -3701,6 +3702,7 @@ tao_yyreduce:
                     }
 
                   break;
+#endif
                 case AST_Expression::EV_octet:
                   if (ev->u.oval == 0)
                     {
@@ -5110,7 +5112,7 @@ tao_yyreduce:
                   tao_yyval.dcval =
                     idl_global->gen ()->create_sequence (
                         idl_global->gen ()->create_expr (
-                                                (ACE_UINT64) 0,
+                                                (idl_uns_long) 0,
                                                 AST_Expression::EV_ulong
                                               ),
                         tp,
@@ -5210,7 +5212,7 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_string (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
@@ -5288,7 +5290,7 @@ tao_yyreduce:
            */
           tao_yyval.dcval =
             idl_global->gen ()->create_wstring (
-                idl_global->gen ()->create_expr ((ACE_UINT64) 0,
+                idl_global->gen ()->create_expr ((idl_uns_long) 0,
                                                  AST_Expression::EV_ulong)
               );
           /*
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 409d65edcb1..ed97b8e6fbc 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -212,7 +212,7 @@ typedef union TAO_YYSTYPE {
   FE_Declarator                 *deval;         /* Declarator value     */
   idl_bool                      bval;           /* Boolean value        */
   long                          ival;           /* Long value           */
-  ACE_UINT64                    uival;          /* Unsigned long value  */
+  idl_uns_long                  uival;          /* Unsigned long value  */
   double                        dval;           /* Double value         */
   float                         fval;           /* Float value          */
   char                          cval;           /* Char value           */
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 2c0c017ee36..c8115168e4c 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -68,6 +68,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #define _AST_EXPRESSION_AST_EXPRESSION_HH
 
 #include "ace/CDR_Stream.h"
+#include "idl_uns_long.h"
 #include "utl_scoped_name.h"
 
 class UTL_String;
@@ -205,7 +206,7 @@ public:
 
   AST_Expression (unsigned long ul);
 
-  AST_Expression (ACE_UINT64 ull,
+  AST_Expression (idl_uns_long,
                   ExprType t);
 
   AST_Expression (float f);
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 173646c09fa..a6a5b5fc162 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -71,6 +71,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_argument.h"
 #include "ast_predefined_type.h"
 #include "ast_union_label.h"
+#include "idl_uns_long.h"
 
 class UTL_LabelList;
 class UTL_ExprList;
@@ -283,7 +284,7 @@ public:
   virtual AST_Expression *create_expr (long v,
                                        AST_Expression::ExprType t);
 
-  virtual AST_Expression *create_expr (ACE_UINT64 v,
+  virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr (UTL_String *s);
diff --git a/TAO/TAO_IDL/include/idl_uns_long.h b/TAO/TAO_IDL/include/idl_uns_long.h
new file mode 100644
index 00000000000..039d1dd91fc
--- /dev/null
+++ b/TAO/TAO_IDL/include/idl_uns_long.h
@@ -0,0 +1,19 @@
+// $Id$
+//
+// idl type usigned long
+//
+// Either an 'unsigned long long' or an 'unsigned long'.
+//
+
+#ifndef _IDL_UNS_LONG.H
+#define _IDL_UNS_LONG.H
+
+#include "ace/Basic_Types.h"
+
+#if defined (ACE_LACKS_LONGLONG_T)
+  typedef unsigned long idl_uns_long;
+#else
+  typedef ACE_UINT64    idl_uns_long;
+#endif /* ACE_LACKS_LONGLONG_T */
+
+#endif _IDL_UNS_LONG.H
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 9af235781a1..76034c5f306 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -1477,7 +1477,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
 
   (void) c->fe_add_structure (connection);
 
-  ACE_UINT64 bound = 0;
+  idl_uns_long bound = 0;
   AST_Expression *bound_expr =
     idl_global->gen ()->create_expr (bound,
                                      AST_Expression::EV_ulong);