summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/include
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/include')
-rw-r--r--TAO/TAO_IDL/include/ast_argument.h4
-rw-r--r--TAO/TAO_IDL/include/ast_concrete_type.h2
-rw-r--r--TAO/TAO_IDL/include/ast_constant.h2
-rw-r--r--TAO/TAO_IDL/include/ast_decl.h2
-rw-r--r--TAO/TAO_IDL/include/ast_enum_val.h2
-rw-r--r--TAO/TAO_IDL/include/ast_factory.h4
-rw-r--r--TAO/TAO_IDL/include/ast_field.h4
-rw-r--r--TAO/TAO_IDL/include/ast_generator.h2
-rw-r--r--TAO/TAO_IDL/include/ast_predefined_type.h2
-rw-r--r--TAO/TAO_IDL/include/ast_visitor.h2
-rw-r--r--TAO/TAO_IDL/include/drv_private.h4
-rw-r--r--TAO/TAO_IDL/include/fe_declarator.h6
-rw-r--r--TAO/TAO_IDL/include/fe_extern.h8
-rw-r--r--TAO/TAO_IDL/include/global_extern.h2
-rw-r--r--TAO/TAO_IDL/include/idl_global.h2
-rw-r--r--TAO/TAO_IDL/include/utl_decllist.h2
-rw-r--r--TAO/TAO_IDL/include/utl_err.h54
-rw-r--r--TAO/TAO_IDL/include/utl_exceptlist.h2
18 files changed, 53 insertions, 53 deletions
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index 6671736d03e..24ba8da31eb 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -91,8 +91,8 @@ public:
// Constructor(s).
AST_Argument (void);
- AST_Argument (Direction direction,
- AST_Type *ft,
+ AST_Argument (Direction direction,
+ AST_Type *ft,
UTL_ScopedName *n);
// Destructor.
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index d431ffb3701..68838a4a636 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -78,7 +78,7 @@ public:
// Constructor(s).
AST_ConcreteType (void);
- AST_ConcreteType (AST_Decl::NodeType nt,
+ AST_ConcreteType (AST_Decl::NodeType nt,
UTL_ScopedName *n);
// Destructor.
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index c64f45b21c4..61807f7cb6f 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -87,7 +87,7 @@ public:
AST_Constant (AST_Expression::ExprType et,
AST_Decl::NodeType nt,
- AST_Expression *ev,
+ AST_Expression *ev,
UTL_ScopedName *n);
AST_Constant (AST_Expression::ExprType et,
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 0de498285f0..6ce991ce0ac 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -153,7 +153,7 @@ public:
// Constructor(s).
AST_Decl (void);
- AST_Decl (NodeType type,
+ AST_Decl (NodeType type,
UTL_ScopedName *n,
idl_bool anonymous = I_FALSE);
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 3ce7175ee2d..121c0600619 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 (unsigned long v,
UTL_ScopedName *n);
// Destructor.
diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h
index 6b624ee48b8..8d2becad7df 100644
--- a/TAO/TAO_IDL/include/ast_factory.h
+++ b/TAO/TAO_IDL/include/ast_factory.h
@@ -76,7 +76,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
#include "utl_scope.h"
#include "utl_scoped_name.h"
-class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl,
+class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl,
public virtual UTL_Scope
{
public:
@@ -117,7 +117,7 @@ public:
private:
// Data.
-
+
int argument_count_;
// Number of arguments.
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 9f618224d86..6c9beb7ac42 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -97,12 +97,12 @@ public:
AST_Field (void);
AST_Field (AST_Type *field_type,
- UTL_ScopedName *n,
+ UTL_ScopedName *n,
Visibility vis = vis_NA);
AST_Field (AST_Decl::NodeType nt,
AST_Type *field_type,
- UTL_ScopedName *n,
+ UTL_ScopedName *n,
Visibility vis = vis_NA);
virtual ~AST_Field (void);
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 957a55c1e65..c58cc827bdd 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -135,7 +135,7 @@ public:
// union.
virtual AST_Field *create_field (AST_Type *ft,
UTL_ScopedName *n,
- AST_Field::Visibility vis =
+ AST_Field::Visibility vis =
AST_Field::vis_NA);
// Create a node representing an argument to an operation.
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index e4ae7d28dec..912f0240ac9 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -101,7 +101,7 @@ public:
// Constructor(s).
AST_PredefinedType (void);
- AST_PredefinedType (PredefinedType t,
+ AST_PredefinedType (PredefinedType t,
UTL_ScopedName *n);
virtual ~AST_PredefinedType (void);
diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h
index 34632a4da60..64d24d9582b 100644
--- a/TAO/TAO_IDL/include/ast_visitor.h
+++ b/TAO/TAO_IDL/include/ast_visitor.h
@@ -63,7 +63,7 @@ class TAO_IDL_FE_Export ast_visitor
//
// = DESCRIPTION
// To implement BE processing we use the "Visitor Pattern", this
- // is the abstract "Visitor". This class is the abstract base class
+ // is the abstract "Visitor". This class is the abstract base class
// for visitors that traverse the AST_<node> classes. Other abstract
// classes for C++ code generation, Java code generation, or IfR
// administration, for example, can be derived from this class and
diff --git a/TAO/TAO_IDL/include/drv_private.h b/TAO/TAO_IDL/include/drv_private.h
index c8921b2e219..ab89a4e7862 100644
--- a/TAO/TAO_IDL/include/drv_private.h
+++ b/TAO/TAO_IDL/include/drv_private.h
@@ -75,10 +75,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
// The ACE_Process_Options default size of 1024 is sometimes not enough.
const unsigned long TAO_IDL_COMMAND_LINE_BUFFER_SIZE = 4 * 1024;
-extern const char *DRV_files[];
+extern const char *DRV_files[];
// All files to be processed
-extern long DRV_nfiles;
+extern long DRV_nfiles;
// How many are there?
extern long DRV_file_index;
diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h
index 1c183bc21cf..55e4db68caf 100644
--- a/TAO/TAO_IDL/include/fe_declarator.h
+++ b/TAO/TAO_IDL/include/fe_declarator.h
@@ -71,7 +71,7 @@ class FE_Declarator
{
public:
// Enum to denote types of declarators.
- enum DeclaratorType
+ enum DeclaratorType
{
FD_simple, // Simple declarator
FD_complex // Complex declarator (complex_part field used)
@@ -80,8 +80,8 @@ public:
// Operations.
// Constructor and destructor.
- FE_Declarator (UTL_ScopedName *n,
- DeclaratorType dt,
+ FE_Declarator (UTL_ScopedName *n,
+ DeclaratorType dt,
AST_Decl *cp);
virtual ~FE_Declarator (void) {}
diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h
index 49ed04056e1..b8627e3609c 100644
--- a/TAO/TAO_IDL/include/fe_extern.h
+++ b/TAO/TAO_IDL/include/fe_extern.h
@@ -87,20 +87,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
// which is then used in the second stage to create the global scope
// and to populate it with nodes for the predefined types
-TAO_IDL_FE_Export void
+TAO_IDL_FE_Export void
FE_init_stage1 (void); // Initialize stage 1
-TAO_IDL_FE_Export void
+TAO_IDL_FE_Export void
FE_init_stage2 (void); // Initialize stage 2
// Interface to Yacc parser
class File;
-TAO_IDL_FE_Export int
+TAO_IDL_FE_Export int
FE_yyparse (void); // Invode yyparse
-TAO_IDL_FE_Export void
+TAO_IDL_FE_Export void
FE_set_yyin (File *); // Set yyin
// Interface to constructors for objects need by the driver
diff --git a/TAO/TAO_IDL/include/global_extern.h b/TAO/TAO_IDL/include/global_extern.h
index 2e5b3e6e0fa..b00c7405497 100644
--- a/TAO/TAO_IDL/include/global_extern.h
+++ b/TAO/TAO_IDL/include/global_extern.h
@@ -69,7 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
// global_extern.hh - Global data for the IDL compiler
-extern TAO_IDL_FE_Export IDL_GlobalData *idl_global;
+extern TAO_IDL_FE_Export IDL_GlobalData *idl_global;
// Contains all "global" data
// Global functions for the IDL compiler
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 56317a5bddd..090da2d7866 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -369,7 +369,7 @@ public:
ACE_Unbounded_Stack<char *> & pragma_prefixes (void);
// Accessor for the pragma prefix container.
-
+
UTL_ScopedName *string_to_scoped_name (char *s);
// Parses a string with double colons.
diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h
index b7e804cb281..0eb903ce37e 100644
--- a/TAO/TAO_IDL/include/utl_decllist.h
+++ b/TAO/TAO_IDL/include/utl_decllist.h
@@ -100,7 +100,7 @@ private:
};
// Active iterator fooor UTL_DeclList
-class TAO_IDL_FE_Export UTL_DecllistActiveIterator
+class TAO_IDL_FE_Export UTL_DecllistActiveIterator
: public UTL_ListActiveIterator
{
public:
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 88eb7fe798e..17fccba5d85 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -129,41 +129,41 @@ public:
// Report errors with varying numbers of arguments
void error0 (ErrorCode e);
- void error1 (ErrorCode e,
+ void error1 (ErrorCode e,
AST_Decl *t);
- void error2 (ErrorCode e,
- AST_Decl *t1,
+ void error2 (ErrorCode e,
+ AST_Decl *t1,
AST_Decl *t2);
- void error3 (ErrorCode e,
- AST_Decl *t1,
- AST_Decl *t2,
+ void error3 (ErrorCode e,
+ AST_Decl *t1,
+ AST_Decl *t2,
AST_Decl *t3);
// Report warnings with varying numbers of arguments
void warning0 (ErrorCode e);
- void warning1 (ErrorCode e,
+ void warning1 (ErrorCode e,
AST_Decl *t);
- void warning2 (ErrorCode e,
- AST_Decl *t1,
+ void warning2 (ErrorCode e,
+ AST_Decl *t1,
AST_Decl *t2);
- void warning3 (ErrorCode e,
- AST_Decl *t1,
- AST_Decl *t2,
+ void warning3 (ErrorCode e,
+ AST_Decl *t1,
+ AST_Decl *t2,
AST_Decl *t3);
// Report a syntax error in IDL input
void syntax_error(IDL_GlobalData::ParseState ps);
// Report clash of declared and referenced indentifiers
- void redef_error (char *n,
+ void redef_error (char *n,
char *t);
// Report a name being used with different spellings
- void name_case_error (char *n,
+ void name_case_error (char *n,
char *t);
// Same as above, but doesn't increment the error count.
- void name_case_warning (char *n,
+ void name_case_warning (char *n,
char *t);
// Differs from spelling of IDL keyword only by case.
@@ -173,7 +173,7 @@ public:
void idl_keyword_warning (char *n);
// Report an unsuccesful coercion attempt
- void coercion_error (AST_Expression *v,
+ void coercion_error (AST_Expression *v,
AST_Expression::ExprType t);
// Report a failed name lookup attempt.
@@ -191,11 +191,11 @@ public:
// Report an attempt to use a forward declared interface which
// hasn't been defined yet in an inheritance spec
- void inheritance_fwd_error (UTL_ScopedName *n,
+ void inheritance_fwd_error (UTL_ScopedName *n,
AST_Interface *f);
// Report an attempt to inherit from something other than an interface
- void inheritance_error (UTL_ScopedName *n,
+ void inheritance_error (UTL_ScopedName *n,
AST_Decl *d);
void abstract_inheritance_error (UTL_ScopedName *n);
@@ -206,42 +206,42 @@ public:
// Report a situation where a constant was expected but we got
// something else instead. This most likely is a case where a union
// label did not evaluate to a constant
- void constant_expected (UTL_ScopedName *n,
+ void constant_expected (UTL_ScopedName *n,
AST_Decl *d);
// Report a situation where an enumerator was expected but we got
// something else instead. This occurs when a union with an enum
// discriminator is being parsed and one of the branch labels is
// not an enumerator in that enum
- void enum_val_expected (AST_Union *t,
+ void enum_val_expected (AST_Union *t,
AST_UnionLabel *l);
// Report a failed enumerator lookup in an enum
- void enum_val_lookup_failure (AST_Union *t,
- AST_Enum *e,
+ void enum_val_lookup_failure (AST_Union *t,
+ AST_Enum *e,
UTL_ScopedName *n);
// Report an ambiguous name definition
- void ambiguous (UTL_Scope *s,
- AST_Decl *l,
+ void ambiguous (UTL_Scope *s,
+ AST_Decl *l,
AST_Decl *d);
// Report a forward declared interface which was never defined
void fwd_decl_not_defined (AST_Interface *d);
// Report attempt to lookup in forward declared interface
- void fwd_decl_lookup (AST_Interface *d,
+ void fwd_decl_lookup (AST_Interface *d,
UTL_ScopedName *n);
// Report a redefinition in scope
- void redefinition_in_scope (AST_Decl *t,
+ void redefinition_in_scope (AST_Decl *t,
AST_Decl *s);
// Report not a type error
void not_a_type (AST_Decl *d);
// Report back-end error
- void back_end (long lineno,
+ void back_end (long lineno,
UTL_String *s);
};
diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h
index f1e3f64905f..3d411e2a6a4 100644
--- a/TAO/TAO_IDL/include/utl_exceptlist.h
+++ b/TAO/TAO_IDL/include/utl_exceptlist.h
@@ -100,7 +100,7 @@ private:
};
// Active iterator for UTL_ExceptList
-class TAO_IDL_FE_Export UTL_ExceptlistActiveIterator
+class TAO_IDL_FE_Export UTL_ExceptlistActiveIterator
: public UTL_ListActiveIterator
{
public:
View Lorry Controller Status