summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL/be_include/be_visitor_operation
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/TAO_IDL/be_include/be_visitor_operation')
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h90
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h67
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h78
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h79
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h25
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h75
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_invoke_cs.h52
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h51
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h73
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h24
-rw-r--r--TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h31
11 files changed, 102 insertions, 543 deletions
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
deleted file mode 100644
index e27360f0b29..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO IDL
-//
-// = FILENAME
-// compiled_marshal.h
-//
-// = DESCRIPTION
-// Visitor for generating code for IDL operations. This generates the code
-// for passing the return type variable to the CDR ops
-// made.
-//
-// = AUTHOR
-// Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_
-#define _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_
-
-// ************************************************************
-// Operation visitor for passing return variable to do_static_call
-// ************************************************************
-
-class be_visitor_operation_rettype_compiled_marshal :public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_compiled_marshal
- //
- // = DESCRIPTION
- // This is a visitor to generate a variable declaration ofr an operation
- // return type
- //
-public:
- be_visitor_operation_rettype_compiled_marshal (be_visitor_context *ctx);
- // constructor
-
- ~be_visitor_operation_rettype_compiled_marshal (void);
- // destructor
-
- int visit_operation (be_operation *node);
- // visit operation
-
- int visit_array (be_array *node);
- // visit an array node
-
- int visit_enum (be_enum *node);
- // visit an enum node
-
- int visit_interface (be_interface *node);
- // visit an interface node
-
- int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface node
-
-#ifdef IDL_HAS_VALUETYPE
- virtual int visit_valuetype (be_valuetype *node);
- // visit valuetype
-
- virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
- // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
- int visit_predefined_type (be_predefined_type *node);
- // visit a predefined type node
-
- int visit_sequence (be_sequence *node);
- // visit a sequence node
-
- int visit_string (be_string *node);
- // visit a sequence node
-
- int visit_structure (be_structure *node);
- // visit a structure node
-
- int visit_typedef (be_typedef *node);
- // visit a typedef node
-
- int visit_union (be_union *node);
- // visit a union node
-
-};
-
-#endif /* _BE_VISITOR_OPERATION_RETTYPE_COMPILED_MARSHAL_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
index 887f6c3dd0b..60c35235659 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
@@ -49,10 +49,11 @@ public:
// visit argument to generate ParamData entries
// = template methods
- virtual int gen_pre_stub_info (be_operation *, be_type *) = 0;
+ virtual int gen_pre_stub_info (be_operation *node);
// generate any info before the actual code for the stub is generated
- virtual int gen_marshal_and_invoke (be_operation *, be_type *) = 0;
+ virtual int gen_marshal_and_invoke (be_operation *node,
+ be_type *bt);
// generate code that marshals the arguments and transmits them
// =helper
@@ -60,16 +61,16 @@ public:
// stuff to output after every member of the scope is handled
virtual int gen_raise_exception (be_type *,
- const char * excep,
- const char * status);
+ const char *excep,
+ const char *status);
// helper that generates code for raising an exception
virtual int gen_check_exception (be_type *);
// helper that generates code for checking for an exception
virtual int gen_raise_interceptor_exception (be_type *,
- const char * excep,
- const char * status);
+ const char *excep,
+ const char *status);
// helper that generates code for raising an exception within
// interceptor's try block
@@ -85,58 +86,4 @@ private:
char *operation_name_;
};
-// specialized visitors
-
-class be_interpretive_visitor_operation_cs : public be_visitor_operation_cs
-{
- //
- // = TITLE
- // be_interpretive_visitor_operation_cs
- //
- // = DESCRIPTION
- // This is a concrete visitor to generate the client stubs for operation
- // using interpretive marshaling.
- //
- //
-public:
- be_interpretive_visitor_operation_cs (be_visitor_context *);
- // ctor
-
- ~be_interpretive_visitor_operation_cs (void);
- // dtor
-
- virtual int gen_pre_stub_info (be_operation *, be_type *);
- // generate any info before the actual code for the stub is generated
-
- virtual int gen_marshal_and_invoke (be_operation *, be_type *);
- // generate code that marshals the arguments and transmits them
-
-};
-
-class be_compiled_visitor_operation_cs : public be_visitor_operation_cs
-{
- //
- // = TITLE
- // be_compiled_visitor_operation_cs
- //
- // = DESCRIPTION
- // This is a concrete visitor to generate the client stubs for operation
- // using compiled marshaling.
- //
- //
-public:
- be_compiled_visitor_operation_cs (be_visitor_context *);
- // ctor
-
- ~be_compiled_visitor_operation_cs (void);
- // dtor
-
- virtual int gen_pre_stub_info (be_operation *, be_type *);
- // generate any info before the actual code for the stub is generated
-
- virtual int gen_marshal_and_invoke (be_operation *, be_type *);
- // generate code that marshals the arguments and transmits them
-
-};
-
#endif /* _BE_VISITOR_OPERATION_OPERATION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
index b1d0bceb5bd..1b73adb8edd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
@@ -50,13 +50,15 @@ public:
// template methods
- virtual int gen_pre_skel_info (be_operation *, be_type *) = 0;
+ virtual int gen_pre_skel_info (be_operation *node);
// generate any pre skeleton code info
- virtual int gen_demarshal_params (be_operation *, be_type *) = 0;
+ virtual int gen_demarshal_params (be_operation *node,
+ be_type *bt);
// generate code for demarshaling incoming parameters
- virtual int gen_marshal_params (be_operation *, be_type *) = 0;
+ virtual int gen_marshal_params (be_operation *node,
+ be_type *bt);
// generate code for marshaling outgoing parameters
// = helper
@@ -64,9 +66,9 @@ public:
// stuff to output after every member of the scope is handled
virtual int gen_raise_exception (be_type *,
- const char * excep,
- const char * status,
- const char * env);
+ const char *excep,
+ const char *status,
+ const char *env);
// helper that generates code for raising an exception
virtual int gen_check_exception (be_type *, const char *env);
@@ -84,68 +86,4 @@ private:
char *operation_name_;
};
-// concrete visitors
-
-class be_interpretive_visitor_operation_ss : public be_visitor_operation_ss
-{
- //
- // = TITLE
- // be_interpretive_visitor_operation_ss
- //
- // = DESCRIPTION
- // This is a concrete visitor to generate the server skeletons for
- // operation using interpretive marshaling
- //
- //
-public:
- be_interpretive_visitor_operation_ss (be_visitor_context *ctx);
- // constructor
-
- ~be_interpretive_visitor_operation_ss (void);
- // destructor
-
- // template methods
-
- virtual int gen_pre_skel_info (be_operation *, be_type *);
- // generate any pre skeleton code info
-
- virtual int gen_demarshal_params (be_operation *, be_type *);
- // generate code for demarshaling incoming parameters
-
- virtual int gen_marshal_params (be_operation *, be_type *);
- // generate code for marshaling outgoing parameters
-
-};
-
-class be_compiled_visitor_operation_ss : public be_visitor_operation_ss
-{
- //
- // = TITLE
- // be_compiled_visitor_operation_ss
- //
- // = DESCRIPTION
- // This is a concrete visitor to generate the server skeletons for
- // operation using compiled marshaling
- //
- //
-public:
- be_compiled_visitor_operation_ss (be_visitor_context *ctx);
- // constructor
-
- ~be_compiled_visitor_operation_ss (void);
- // destructor
-
- // template methods
-
- virtual int gen_pre_skel_info (be_operation *, be_type *);
- // generate any pre skeleton code info
-
- virtual int gen_demarshal_params (be_operation *, be_type *);
- // generate code for demarshaling incoming parameters
-
- virtual int gen_marshal_params (be_operation *, be_type *);
- // generate code for marshaling outgoing parameters
-
-};
-
#endif /* _BE_VISITOR_OPERATION_OPERATION_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h
deleted file mode 100644
index bb7de8fe3ad..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_docall_cs.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO IDL
-//
-// = FILENAME
-// rettype_docall_cs.h
-//
-// = DESCRIPTION
-// Visitor for generating code for IDL operations. This generates the code
-// for passing the return type variable to the docall
-// made.
-//
-// = AUTHOR
-// Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_
-#define _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_
-
-// ************************************************************
-// Operation visitor for passing return variable to do_static_call
-// ************************************************************
-
-class be_visitor_operation_rettype_docall_cs :public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_docall_cs
- //
- // = DESCRIPTION
- // This is a visitor to generate a variable declaration ofr an operation
- // return type
- //
-public:
- be_visitor_operation_rettype_docall_cs (be_visitor_context *ctx);
- // constructor
-
- ~be_visitor_operation_rettype_docall_cs (void);
- // destructor
-
- int visit_array (be_array *node);
- // visit an array node
-
- int visit_enum (be_enum *node);
- // visit an enum node
-
- int visit_interface (be_interface *node);
- // visit an interface node
-
- int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface node
-
- int visit_predefined_type (be_predefined_type *node);
- // visit a predefined type node
-
- int visit_sequence (be_sequence *node);
- // visit a sequence node
-
- int visit_string (be_string *node);
- // visit a sequence node
-
- int visit_structure (be_structure *node);
- // visit a structure node
-
- int visit_typedef (be_typedef *node);
- // visit a typedef node
-
- int visit_union (be_union *node);
- // visit a union node
-
-};
-
-#endif /* _BE_VISITOR_OPERATION_RETTYPE_DOCALL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
index 845ddb5f6c1..50602a01f57 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
@@ -12,7 +12,8 @@
//
// = DESCRIPTION
// Visitor for generating code for IDL operations. This generates the code
-// for passing the return type variable to the marshaler.
+// for passing the return type variable to the CDR ops
+// made.
//
// = AUTHOR
// Aniruddha Gokhale
@@ -20,22 +21,21 @@
// ============================================================================
#ifndef _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_
-#define _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SSH_
+#define _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_
-// ***********************************************************************
-// Operation visitor for passing return type to the marshal/demarshal routine
-// inside the server skeleton
-// ***********************************************************************
+// ************************************************************
+// Operation visitor for passing return variable to invocation
+// ************************************************************
-class be_visitor_operation_rettype_marshal_ss : public be_visitor_decl
+class be_visitor_operation_rettype_marshal_ss :public be_visitor_decl
{
//
// = TITLE
- // be_visitor_operation_rettype_marshal_ss
+ // be_visitor_operation_rettype_compiled_marshal
//
// = DESCRIPTION
- // This is a visitor to pass return type to the marshal/demarshal routines
- //
+ // This is a visitor to generate a variable declaration ofr an operation
+ // return type
//
public:
be_visitor_operation_rettype_marshal_ss (be_visitor_context *ctx);
@@ -44,6 +44,9 @@ public:
~be_visitor_operation_rettype_marshal_ss (void);
// destructor
+ int visit_operation (be_operation *node);
+ // visit operation
+
int visit_array (be_array *node);
// visit an array node
@@ -84,4 +87,4 @@ public:
};
-#endif /* _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SSH_ */
+#endif /* _BE_VISITOR_OPERATION_RETTYPE_MARSHAL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
deleted file mode 100644
index 9129e0b86aa..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO IDL
-//
-// = FILENAME
-// rettype_post_docall_cs.h
-//
-// = DESCRIPTION
-// Visitor for generating code for IDL operations. This generates the code
-// for post processing of the return type variable after the docall is
-// made.
-//
-// = AUTHOR
-// Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_
-#define _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_
-
-// ************************************************************
-// Operation visitor for postprocessing after do_static_call is invoked
-// ************************************************************
-
-class be_visitor_operation_rettype_post_docall_cs :public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_psot_docall_cs
- //
- // = DESCRIPTION
- // This is a visitor to generate any post processing after the do_static_call is
- // made
- //
-public:
- be_visitor_operation_rettype_post_docall_cs (be_visitor_context *ctx);
- // constructor
-
- ~be_visitor_operation_rettype_post_docall_cs (void);
- // destructor
-
- int visit_interface (be_interface *node);
- // visit an interface node
-
- int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface node
-};
-
-// ****************************************************************
-
-class be_visitor_operation_compiled_rettype_post_docall : public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_post_docall
- //
- // = DESCRIPTION
- // This is a visitor for post processing after the invocation in
- // compiled marshaling
- //
- //
-public:
- be_visitor_operation_compiled_rettype_post_docall (be_visitor_context *ctx);
- // constructor
-
- int visit_array (be_array *node);
- int visit_typedef (be_typedef *node);
-};
-
-#endif /* _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_invoke_cs.h
new file mode 100644
index 00000000000..6c03c2a5924
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_invoke_cs.h
@@ -0,0 +1,52 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+// TAO IDL
+//
+// = FILENAME
+// rettype_post_invoke_cs.h
+//
+// = DESCRIPTION
+// Visitor for generating code for IDL operations. This generates the code
+// for post processing of the return type variable after the docall is
+// made.
+//
+// = AUTHOR
+// Aniruddha Gokhale
+//
+// ============================================================================
+
+#ifndef _BE_VISITOR_OPERATION_RETTYPE_POST_INVOKE_CS_H_
+#define _BE_VISITOR_OPERATION_RETTYPE_POST_INVOKE_CS_H_
+
+// ************************************************************
+// Operation visitor for postprocessing after invocation
+// ************************************************************
+
+class be_visitor_operation_rettype_post_invoke_cs : public be_visitor_decl
+{
+ //
+ // = TITLE
+ // be_visitor_operation_rettype_post_docall
+ //
+ // = DESCRIPTION
+ // This is a visitor for post processing after the invocation in
+ // compiled marshaling
+ //
+ //
+public:
+ be_visitor_operation_rettype_post_invoke_cs (be_visitor_context *ctx);
+ // constructor
+
+ int visit_array (be_array *node);
+ // visit an array node
+
+ int visit_typedef (be_typedef *node);
+ // visit a typedef node
+};
+
+#endif /* _BE_VISITOR_OPERATION_RETTYPE_POST_INVOKE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
index 3ba7eedbef3..55b0a515e03 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
@@ -31,7 +31,7 @@ class be_visitor_operation_rettype_post_upcall_ss : public be_visitor_decl
{
//
// = TITLE
- // be_visitor_operation_rettype_post_upcall_ss
+ // be_visitor_operation_rettype_post_upcall
//
// = DESCRIPTION
// This is a visitor for post processing after an upcall
@@ -41,60 +41,11 @@ public:
be_visitor_operation_rettype_post_upcall_ss (be_visitor_context *ctx);
// constructor
- ~be_visitor_operation_rettype_post_upcall_ss (void);
- // destructor
-
int visit_array (be_array *node);
// visit an array node
- int visit_enum (be_enum *node);
- // visit an enum node
-
- int visit_interface (be_interface *node);
- // visit an interface node
-
- int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface node
-
- int visit_predefined_type (be_predefined_type *node);
- // visit a predefined type node
-
- int visit_sequence (be_sequence *node);
- // visit a sequence node
-
- int visit_string (be_string *node);
- // visit a sequence node
-
- int visit_structure (be_structure *node);
- // visit a structure node
-
int visit_typedef (be_typedef *node);
// visit a typedef node
-
- int visit_union (be_union *node);
- // visit a union node
-
-};
-
-// ****************************************************************
-
-class be_visitor_operation_compiled_rettype_post_upcall : public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_post_upcall
- //
- // = DESCRIPTION
- // This is a visitor for post processing after an upcall in
- // compiled marshaling
- //
- //
-public:
- be_visitor_operation_compiled_rettype_post_upcall (be_visitor_context *ctx);
- // constructor
-
- int visit_array (be_array *node);
- int visit_typedef (be_typedef *node);
};
#endif /* _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h
deleted file mode 100644
index 2a11b2cd605..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_docall_cs.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-// TAO IDL
-//
-// = FILENAME
-// rettype_pre_docall_cs.h
-//
-// = DESCRIPTION
-// Visitor for generating code for IDL operations. This generates the code
-// for pre processing of the return type variable before the docall is
-// made.
-//
-// = AUTHOR
-// Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_
-#define _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_
-
-// ************************************************************
-// Operation visitor for preprocessing before do_static_call is invoked
-// ************************************************************
-
-class be_visitor_operation_rettype_pre_docall_cs :public be_visitor_decl
-{
- //
- // = TITLE
- // be_visitor_operation_rettype_pre_docall_cs
- //
- // = DESCRIPTION
- // This is a visitor to generate any pre processing before the do_static_call is
- // made
- //
-public:
- be_visitor_operation_rettype_pre_docall_cs (be_visitor_context *ctx);
- // constructor
-
- ~be_visitor_operation_rettype_pre_docall_cs (void);
- // destructor
-
- virtual int visit_array (be_array *node);
- // visit an array node
-
- virtual int visit_interface (be_interface *node);
- // visit an interface node
-
- virtual int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface node
-
- virtual int visit_predefined_type (be_predefined_type *node);
- // visit a predefined type node
-
- virtual int visit_sequence (be_sequence *node);
- // visit a sequence node
-
- virtual int visit_structure (be_structure *node);
- // visit a structure node
-
- virtual int visit_typedef (be_typedef *node);
- // visit a typedef node
-
- virtual int visit_union (be_union *node);
- // visit a union node
-
-};
-
-#endif /* _BE_VISITOR_OPERATION_RETTYPE_PRE_DOCALL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
index 2abe28ed76f..3ffbc85229c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_pre_invoke_cs.h
@@ -27,16 +27,15 @@
// Operation visitor for preprocessing before invoke is invoked
// ************************************************************
-class be_visitor_operation_rettype_pre_invoke_cs :
- public be_visitor_operation_rettype_pre_docall_cs
+class be_visitor_operation_rettype_pre_invoke_cs : public be_visitor_decl
{
//
// = TITLE
// be_visitor_operation_rettype_pre_invoke_cs
//
// = DESCRIPTION
- // This is a visitor to generate any pre processing before the do_static_call is
- // made
+ // This is a visitor to generate any pre processing before
+ // the invocation is made.
//
public:
be_visitor_operation_rettype_pre_invoke_cs (be_visitor_context *ctx);
@@ -45,12 +44,29 @@ public:
~be_visitor_operation_rettype_pre_invoke_cs (void);
// destructor
+ virtual int visit_array (be_array *node);
+ // visit an array node
+
virtual int visit_interface (be_interface *node);
// visit an interface node
virtual int visit_interface_fwd (be_interface_fwd *node);
// visit an interface node
+ virtual int visit_predefined_type (be_predefined_type *node);
+ // visit a predefined type node
+
+ virtual int visit_sequence (be_sequence *node);
+ // visit a sequence node
+
+ virtual int visit_structure (be_structure *node);
+ // visit a structure node
+
+ virtual int visit_typedef (be_typedef *node);
+ // visit a typedef node
+
+ virtual int visit_union (be_union *node);
+ // visit a union node
};
#endif /* _BE_VISITOR_OPERATION_RETTYPE_PRE_INVOKE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
index 5adf69c8c89..44ee6ef34eb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
@@ -84,35 +84,4 @@ public:
};
-// ************************************************************
-// Operation visitor for return type variable declaration in the server
-// skeleton using compiled marshaling. This one overrides 2 methods of the base
-// class
-// ************************************************************
-
-class be_compiled_visitor_operation_rettype_vardecl_ss :
- public be_visitor_operation_rettype_vardecl_ss
-{
- //
- // = TITLE
- // be_compiled_visitor_operation_rettype_vardecl_ss
- //
- // = DESCRIPTION
- // This is a visitor to generate a variable declaration ofr an operation
- // return type in the server skeleton using compiled marshaling
- //
-public:
- be_compiled_visitor_operation_rettype_vardecl_ss (be_visitor_context *ctx);
- // constructor
-
- ~be_compiled_visitor_operation_rettype_vardecl_ss (void);
- // destructor
-
- virtual int visit_interface (be_interface *node);
- // visit an interface node
-
- virtual int visit_interface_fwd (be_interface_fwd *node);
- // visit an interface fwd node
-};
-
#endif /* _BE_VISITOR_OPERATION_RETTYPE_VARDECL_SS_H_ */