ChangeLogTag: Mon Sep 29 13:35:43 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>

4 files changed, 35 insertions, 35 deletions

diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 4248eb2761e..47280c29a8f 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -67,6 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_ARRAY_AST_ARRAY_HH
 #define _AST_ARRAY_AST_ARRAY_HH
 
+#include "ace/CDR_Base.h"
+
 #include "ast_concrete_type.h"
 
 class UTL_ExprList;
@@ -86,7 +88,7 @@ public:
   AST_Array (void);
 
   AST_Array (UTL_ScopedName *n,
-             unsigned long ndims,
+             ACE_CDR::ULong ndims,
              UTL_ExprList *dims,
              bool local,
              bool abstract);
@@ -96,11 +98,11 @@ public:
 
   // Data Accessors.
 
-  unsigned long n_dims (void);
+  ACE_CDR::ULong n_dims (void);
 
   AST_Expression **dims (void);
   void set_dims (AST_Expression **,
-                 unsigned long);
+                 ACE_CDR::ULong);
 
   AST_Type *base_type (void) const;
   void set_base_type (AST_Type *nbt);
@@ -130,7 +132,7 @@ protected:
 private:
   // Data.
 
-  unsigned long pd_n_dims;
+  ACE_CDR::ULong pd_n_dims;
   // How many dimensions?
 
   AST_Expression **pd_dims;
@@ -147,7 +149,7 @@ private:
 
   // Compute how many dimensions.
   AST_Expression **compute_dims (UTL_ExprList *dims,
-                                 unsigned long ndims);
+                                 ACE_CDR::ULong ndims);
 };
 
 #endif           // _AST_ARRAY_AST_ARRAY_HH
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 478cac4072d..80af9da9230 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -79,7 +79,7 @@ public:
   // Constructor(s).
   AST_EnumVal (void);
 
-  AST_EnumVal (unsigned long v,
+  AST_EnumVal (ACE_CDR::ULong v,
                UTL_ScopedName *n);
 
   // Destructor.
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 80b4a65c267..04342a9f486 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -68,7 +68,6 @@ 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;
@@ -163,11 +162,11 @@ public:
 
       union
         {
-          short               sval;     // Contains short expression value.
-          unsigned short      usval;    // Contains unsigned short expr value.
-          long                lval;     // Contains long expression value.
-          unsigned long       ulval;    // Contains unsigned long expr value.
-          bool                bval;     // Contains boolean expression value.
+          ACE_CDR::Short      sval;     // Contains short expression value.
+          ACE_CDR::UShort     usval;    // Contains unsigned short expr value.
+          ACE_CDR::Long       lval;     // Contains long expression value.
+          ACE_CDR::ULong      ulval;    // Contains unsigned long expr value.
+          ACE_CDR::Boolean    bval;     // Contains boolean expression value.
 #if ! defined (ACE_LACKS_LONGLONG_T)
           ACE_CDR::LongLong   llval;   // Contains long long expr value.
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -176,14 +175,14 @@ public:
 #elif ! defined (ACE_LACKS_LONGLONG_T)
           ACE_CDR::ULongLong  ullval;  // Contains unsigned long long expr value.
 #endif /* defined (ACE_LACKS_UNSIGNEDLONGLONG_T) && ! defined (ACE_LACKS_LONGLONG_T) */
-          float               fval;     // Contains 32-bit float expr value.
-          double              dval;     // Contains 64-bit float expr value.
-          char                cval;     // Contains char expression value.
+          ACE_CDR::Float      fval;     // Contains 32-bit float expr value.
+          ACE_CDR::Double     dval;     // Contains 64-bit float expr value.
+          ACE_CDR::Char       cval;     // Contains char expression value.
           ACE_CDR::WChar      wcval;    // Contains wchar expression value.
-          unsigned char       oval;     // Contains unsigned char expr value.
+          ACE_CDR::Octet      oval;     // Contains octet expr value.
           UTL_String          *strval;  // Contains String * expr value.
           char                *wstrval; // Contains wide string expr value.
-          unsigned long       eval;     // Contains enumeration value.
+          ACE_CDR::ULong      eval;     // Contains enumeration value.
         } u;
 
       ExprType et;
@@ -199,28 +198,28 @@ public:
                   AST_Expression *v1,
                   AST_Expression *v2);
 
-  AST_Expression (short s);
+  AST_Expression (ACE_CDR::Short s);
 
-  AST_Expression (unsigned short us);
+  AST_Expression (ACE_CDR::UShort us);
 
-  AST_Expression (long l);
+  AST_Expression (ACE_CDR::Long l);
 
-  AST_Expression (bool b);
+  AST_Expression (ACE_CDR::Boolean b);
 
-  AST_Expression (unsigned long ul);
+  AST_Expression (ACE_CDR::ULong ul);
 
-  AST_Expression (idl_uns_long,
+  AST_Expression (ACE_CDR::ULong,
                   ExprType t);
 
-  AST_Expression (float f);
+  AST_Expression (ACE_CDR::Float f);
 
-  AST_Expression (double d);
+  AST_Expression (ACE_CDR::Double d);
 
-  AST_Expression (char c);
+  AST_Expression (ACE_CDR::Char c);
 
   AST_Expression (ACE_OutputCDR::from_wchar wc);
 
-  AST_Expression (unsigned char uc);
+  AST_Expression (ACE_CDR::Octet o);
 
   AST_Expression (UTL_String *s);
 
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 37e34755e1c..fa60693d5e4 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -71,7 +71,6 @@ 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;
@@ -282,30 +281,30 @@ public:
                                        AST_Expression *v1,
                                        AST_Expression *v2);
 
-  virtual AST_Expression *create_expr (long v);
+  virtual AST_Expression *create_expr (ACE_CDR::Long v);
 
-  virtual AST_Expression *create_expr (bool b);
+  virtual AST_Expression *create_expr (ACE_CDR::Boolean b);
 
-  virtual AST_Expression *create_expr (idl_uns_long v,
+  virtual AST_Expression *create_expr (ACE_CDR::ULong v,
                                        AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr (UTL_String *s);
 
   virtual AST_Expression *create_expr (char *s);
 
-  virtual AST_Expression *create_expr (char c);
+  virtual AST_Expression *create_expr (ACE_CDR::Char c);
 
   virtual AST_Expression *create_expr (ACE_OutputCDR::from_wchar wc);
 
-  virtual AST_Expression *create_expr (double d);
+  virtual AST_Expression *create_expr (ACE_CDR::Double d);
 
   // Create a node representing an enumerator.
-  virtual AST_EnumVal *create_enum_val (unsigned long v,
+  virtual AST_EnumVal *create_enum_val (ACE_CDR::ULong v,
                                         UTL_ScopedName *n);
 
   // Create a node representing an array type.
   virtual AST_Array *create_array (UTL_ScopedName *n,
-                                   unsigned long ndims,
+                                   ACE_CDR::ULong ndims,
                                    UTL_ExprList *dims,
                                    bool is_local,
                                    bool is_abstract);