ChangeLogTag: Thu Jan 31 13:26:33 2002 Jeff Parsons <parsons@cs.wustl.edu>

53 files changed, 60 insertions, 201 deletions

diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 9e6534b9cb1..4ccf3e49dc5 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -761,7 +761,6 @@ AST_Module::dump (ACE_OSTREAM_TYPE &o)
 void
 AST_Module::set_has_nested_valuetype (void)
 {
-#ifdef IDL_HAS_VALUETYPE
   UTL_Scope *parent = this->defined_in ();
 
   if (!this->pd_has_nested_valuetype && parent)
@@ -775,7 +774,6 @@ AST_Module::set_has_nested_valuetype (void)
     }
 
   this->pd_has_nested_valuetype = 1;
-#endif /* IDL_HAS_VALUETYPE */
 }
 
 idl_bool
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index f5c1b100dee..5db3572a94c 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -50,9 +50,7 @@ BE_GlobalData::BE_GlobalData (void)
       output_dir_ (0),
       any_support_ (I_TRUE),
       tc_support_ (I_TRUE),
-#ifdef IDL_HAS_VALUETYPE
       obv_opt_accessor_ (0),
-#endif /* IDL_HAS_VALUETYPE */
       gen_impl_files_ (I_FALSE),
       gen_copy_ctor_ (I_FALSE),
       gen_assign_op_ (I_FALSE),
@@ -654,7 +652,6 @@ BE_GlobalData::tc_support (void)
   return this->tc_support_;
 }
 
-#ifdef IDL_HAS_VALUETYPE
 void
 BE_GlobalData::obv_opt_accessor (idl_bool val)
 {
@@ -666,7 +663,6 @@ BE_GlobalData::obv_opt_accessor (void)
 {
   return this->obv_opt_accessor_;
 }
-#endif /* IDL_HAS_VALUETYPE */
 
 void
 BE_GlobalData::gen_impl_files (idl_bool val)
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index d686fa83cdf..8ab31451328 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -46,6 +46,7 @@ int be_visitor_args_arglist::visit_argument (be_argument *node)
 
   // retrieve the type
   be_type *bt = be_type::narrow_from_decl (node->field_type ());
+
   if (!bt)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,6 +87,7 @@ int be_visitor_args_arglist::visit_array (be_array *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -105,6 +107,7 @@ int be_visitor_args_arglist::visit_enum (be_enum *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -124,6 +127,7 @@ int be_visitor_args_arglist::visit_interface (be_interface *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -143,6 +147,7 @@ int be_visitor_args_arglist::visit_interface_fwd (be_interface_fwd *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -255,6 +260,7 @@ int be_visitor_args_arglist::visit_sequence (be_sequence *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -312,6 +318,7 @@ int be_visitor_args_arglist::visit_structure (be_structure *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -331,12 +338,14 @@ int be_visitor_args_arglist::visit_union (be_union *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
 int be_visitor_args_arglist::visit_typedef (be_typedef *node)
 {
   this->ctx_->alias (node);
+
   if (node->primitive_base_type ()->accept (this) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -345,13 +354,12 @@ int be_visitor_args_arglist::visit_typedef (be_typedef *node)
                          "accept on primitive type failed\n"),
                         -1);
     }
+
   this->ctx_->alias (0);
   return 0;
 }
 
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_arglist::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
@@ -368,6 +376,7 @@ int be_visitor_args_arglist::visit_valuetype (be_valuetype *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
@@ -387,7 +396,7 @@ int be_visitor_args_arglist::visit_valuetype_fwd (be_valuetype_fwd *node)
       *os << this->type_name (node, "_out");
       break;
     }
+
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
index d805f8cab9b..e24a84e9ce0 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
@@ -319,16 +319,14 @@ int be_visitor_args_invoke_cs::visit_interface_fwd (be_interface_fwd *)
                          "Bad substate\n"),
                         -1);
     }
+
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_invoke_cs::visit_valuetype (be_valuetype *)
 {
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
+  TAO_OutStream *os = this->ctx_->stream ();
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -364,6 +362,7 @@ int be_visitor_args_invoke_cs::visit_valuetype (be_valuetype *)
                          "Bad substate\n"),
                         -1);
     }
+
   return 0;
 }
 
@@ -411,8 +410,6 @@ be_visitor_args_invoke_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index b4dc39985b0..8842e708c3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -310,8 +310,6 @@ int be_visitor_args_marshal_ss::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_marshal_ss::visit_valuetype (be_valuetype *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -394,8 +392,6 @@ int be_visitor_args_marshal_ss::visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_marshal_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
index a054c4eff34..865425354cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_invoke_cs.cpp
@@ -134,8 +134,6 @@ be_visitor_args_post_invoke_cs::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_args_post_invoke_cs::visit_valuetype (be_valuetype *)
 {
@@ -182,8 +180,6 @@ be_visitor_args_post_invoke_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_args_post_invoke_cs::visit_string (be_string *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
index 9cf85e698d7..8ccd92cb024 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_arglist.cpp
@@ -410,8 +410,6 @@ int be_visitor_args_request_info_arglist::visit_typedef (be_typedef *node)
 }
 
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_request_info_arglist::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -452,4 +450,3 @@ int be_visitor_args_request_info_arglist::visit_valuetype_fwd (be_valuetype_fwd
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
index 547f82a66c7..e2e0b7496e7 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_ch.cpp
@@ -406,8 +406,6 @@ int be_visitor_args_request_info_ch::visit_typedef (be_typedef *node)
 }
 
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_request_info_ch::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
@@ -448,4 +446,3 @@ int be_visitor_args_request_info_ch::visit_valuetype_fwd (
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
index 83fe4584a89..1d1ef00aa91 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_result.cpp
@@ -121,8 +121,6 @@ int be_visitor_args_request_info_result::visit_interface_fwd (be_interface_fwd *
 
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_request_info_result::visit_valuetype (be_valuetype *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -145,8 +143,6 @@ int be_visitor_args_request_info_result::visit_valuetype_fwd (be_valuetype_fwd *
 
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_args_request_info_result::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
index 24a38fd8c36..07ffc2bf17a 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/request_info_sh.cpp
@@ -332,8 +332,6 @@ int be_visitor_args_request_info_sh::visit_typedef (be_typedef *node)
 }
 
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_request_info_sh::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get the stream
@@ -372,4 +370,3 @@ int be_visitor_args_request_info_sh::visit_valuetype_fwd (be_valuetype_fwd *node
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index dc9fc385ba3..857d33a1896 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -184,8 +184,6 @@ int be_visitor_args_upcall_ss::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_upcall_ss::visit_valuetype (be_valuetype *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -250,9 +248,6 @@ int be_visitor_args_upcall_ss::visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
-
 int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index eba9ac33fd7..6113da06ab4 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -191,8 +191,6 @@ int be_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *node)
 }
 
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_args_vardecl_ss::visit_valuetype (be_valuetype *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -249,8 +247,6 @@ int be_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index c7e21bf4db3..0e67616f8a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -281,8 +281,6 @@ be_visitor_field_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 // Visit valuetype type.
 int
 be_visitor_field_ch::visit_valuetype (be_valuetype *node)
@@ -345,8 +343,6 @@ be_visitor_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 // Visit predefined type.
 int
 be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
index c28dc300c16..a119d621f85 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_info_rettype.cpp
@@ -265,8 +265,6 @@ be_visitor_operation_interceptors_info_rettype::visit_union (be_union *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_operation_interceptors_info_rettype::visit_valuetype (be_valuetype *node)
 {
@@ -301,4 +299,3 @@ be_visitor_operation_interceptors_info_rettype::visit_valuetype_fwd (be_valuetyp
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_result.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_result.cpp
index a45a45785d6..f7f400d7de3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_result.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_result.cpp
@@ -92,7 +92,6 @@ be_visitor_operation_interceptors_result::visit_interface_fwd (be_interface_fwd
 
   return 0;
 }
-#ifdef IDL_HAS_VALUETYPE
 
 int
 be_visitor_operation_interceptors_result::visit_valuetype (be_valuetype *)
@@ -118,7 +117,6 @@ be_visitor_operation_interceptors_result::visit_valuetype_fwd (be_valuetype_fwd
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
 
 int
 be_visitor_operation_interceptors_result::visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index e93e197ad8f..973012c93b6 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -307,8 +307,6 @@ be_visitor_operation_rettype::visit_union (be_union *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_operation_rettype::visit_valuetype (be_valuetype *node)
 {
@@ -351,4 +349,3 @@ be_visitor_operation_rettype::visit_valuetype_fwd (be_valuetype_fwd *node)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
index b71a3e0c7e1..65f263d1a45 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
@@ -87,8 +87,6 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_operation_rettype_assign_ss::visit_valuetype (be_valuetype *)
 {
@@ -112,8 +110,6 @@ visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_assign_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
index 6a544cbaec8..6abd8fdaf79 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
@@ -206,8 +206,6 @@ int be_visitor_operation_rettype_marshal_ss::visit_interface_fwd (be_interface_f
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int be_visitor_operation_rettype_marshal_ss::visit_valuetype (be_valuetype *)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -254,8 +252,6 @@ int be_visitor_operation_rettype_marshal_ss::visit_valuetype_fwd (be_valuetype_f
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_operation_rettype_marshal_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index 9449e424bf1..300c34bb256 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -80,8 +80,6 @@ be_visitor_operation_rettype_return_cs::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_operation_rettype_return_cs::visit_valuetype (be_valuetype *)
 {
@@ -100,8 +98,6 @@ be_visitor_operation_rettype_return_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_return_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index ccb41acf854..79602578ad9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -144,8 +144,6 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 int
 be_visitor_operation_rettype_vardecl_cs::visit_valuetype (be_valuetype *node)
 {
@@ -183,8 +181,6 @@ be_visitor_operation_rettype_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_vardecl_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
index 5903a957956..74034b7c6ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
@@ -104,7 +104,6 @@ visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
 // like be_compiled_visitor_operation_rettype_vardecl_ss
 int
 be_visitor_operation_rettype_vardecl_ss::visit_valuetype (be_valuetype *node)
@@ -125,8 +124,6 @@ visit_valuetype_fwd (be_valuetype_fwd *node)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_vardecl_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index b0ba75fe91c..4d184a3099d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -325,8 +325,6 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
 // Visit valuetype type.
 int
 be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
@@ -409,8 +407,6 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
-
 // Visit predefined type.
 int
 be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 0dc210aa3ed..a0a3b2e5398 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -246,69 +246,70 @@ public:
   // <tao_idl> is called.
 
   virtual void any_support (idl_bool);
-  // enable suppressing any support    ?T.Kuepper: suppressed?
+  // Set any support.
 
   virtual idl_bool any_support (void);
-  // check if Any support is suppressed  ? enabled ?
+  // Check Any support.
 
   virtual void tc_support (idl_bool);
-  // enable suppressing TypeCode support
+  // Set TypeCode support.
 
   virtual idl_bool tc_support (void);
-  // check if TypeCode support is suppressed
+  // Check TypeCode support
 
-#ifdef IDL_HAS_VALUETYPE
   virtual void obv_opt_accessor (idl_bool);
+  // Set optimized valuetype member accessor generation.
+
   virtual idl_bool obv_opt_accessor (void);
-#endif /* IDL_HAS_VALUETYPE */
+  // Check optimized valuetype member accessor generation.
 
   virtual void gen_impl_files (idl_bool);
-  //enable generation of implementation files
+  // Set generation of implementation files.
 
   virtual idl_bool gen_impl_files (void);
-  // check if we want to generate implementation files
+  // Check if we want to generate implementation files.
 
   virtual void gen_copy_ctor (idl_bool);
-  //enable generation of copy constructor
+  // Set generation of copy constructor.
 
   virtual idl_bool gen_copy_ctor (void);
-  //check if we want to generate the copy constructor
+  // Check if we want to generate the copy constructor.
 
   virtual void gen_assign_op (idl_bool);
-  //enable the generation of the assignment operator
+  // Set the generation of the assignment operator.
 
   virtual idl_bool gen_assign_op (void);
-  //check if we want to generate the assignment operator
+  // Check if we want to generate the assignment operator.
 
   virtual void gen_thru_poa_collocation (idl_bool);
-  // set whether we want to generate Thru_POA collocation stubs.
+  // Set whether we want to generate Thru_POA collocation stubs.
 
   virtual idl_bool gen_thru_poa_collocation (void);
-  // check if we want to generate Thru_POA collocation stubs.
+  // Check if we want to generate Thru_POA collocation stubs.
 
   virtual void gen_direct_collocation (idl_bool);
-  // set whether we want to generate Direct collocation stubs.
+  // Set whether we want to generate Direct collocation stubs.
 
   virtual idl_bool gen_direct_collocation (void);
-  // check if we want to generate Direct collocation stubs.
+  // Check if we want to generate Direct collocation stubs.
 
   virtual void exception_support (idl_bool);
-  // enable real C++ exceptions
+  // Set real C++ exception support.
 
   virtual idl_bool exception_support (void);
-  // check if real C++ exception support is to be enabled
+  // Check if real C++ exception support is enabled.
 
   virtual void use_raw_throw (idl_bool);
-  // enable replacement of 'ACE_THROW_SPEC' with 'throw'.
+  // Set replacement of 'ACE_THROW_SPEC' with 'throw'.
 
   virtual idl_bool use_raw_throw (void);
-  // check if raw 'throw' generation option is set.
+  // Check if raw 'throw' generation option is set.
 
   virtual void opt_tc (idl_bool);
-  // enable optimized typecodes
+  // Set optimized typecodes.
 
   virtual idl_bool opt_tc (void);
-  // check if TypeCodes need be optimized
+  // Check if TypeCodes are optimized.
 
   virtual void ami_call_back (idl_bool value);
   // To enable or disable AMI call back feature of the Messaging
@@ -324,7 +325,7 @@ public:
   // Return the flag.
 
   virtual void gen_tie_classes (idl_bool value);
-  // Toggle the generation of tie classes and files.
+  // Set the generation of tie classes and files.
 
   virtual idl_bool gen_tie_classes (void);
   // Return the flag.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index 0e784a7e4b1..2bf9e4d56de 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -83,14 +83,11 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
index 928a85ca126..2276f4d42b6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h
@@ -59,13 +59,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
index 61d68377f42..6edd77f21b1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
@@ -58,13 +58,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_invoke_cs.h
index d48f456799f..a77b3aaeda8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_invoke_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_invoke_cs.h
@@ -53,13 +53,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_arglist.h
index 54bd8b47f5a..f0a105f2429 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_arglist.h
@@ -83,14 +83,11 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_REQUEST_INFO_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_ch.h b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_ch.h
index f5d67864253..e258f4af1ad 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_ch.h
@@ -84,14 +84,11 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_REQUEST_INFO_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_result.h b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_result.h
index 7b290a0cbeb..c539301c9e9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_result.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_result.h
@@ -57,13 +57,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_sh.h b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_sh.h
index 8b21e5162e3..ad3963d4a5c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/request_info_sh.h
@@ -84,14 +84,11 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_REQUEST_INFO_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index fc578fe2662..c2eaac62162 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -58,13 +58,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index 5cf3e6c3dfa..9faa901fc69 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -58,13 +58,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index 27e7d702085..942d3f19e1b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -55,13 +55,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype type
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype forward type
-#endif /* IDL_HAS_VALUETYPE */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index c12aeeed170..156212e0c8a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -57,13 +57,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
 
   virtual int visit_module (be_module *node);
   // visit a module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_info_rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_info_rettype.h
index 0ffb85ca703..f166d24ba08 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_info_rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_info_rettype.h
@@ -53,7 +53,7 @@ public:
   // visit an interface node
 
   int visit_interface_fwd (be_interface_fwd *node);
-  // visit an interface node
+  // visit a forward declared interface node
 
   int visit_native (be_native *node);
   // visit native type
@@ -76,11 +76,11 @@ public:
   int visit_union (be_union *node);
   // visit a union node
 
-# ifdef IDL_HAS_VALUETYPE
   int visit_valuetype (be_valuetype *node);
-  int visit_valuetype_fwd (be_valuetype_fwd *node);
-# endif /* IDL_HAS_VALUETYPE */
+  // visit a valuetype node
 
+  int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a forward declared valuetype node
 };
 
 #endif /* _BE_VISITOR_OPERATION_INTERCEPTORS_INFO_RETTYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_result.h b/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_result.h
index a7165b7808c..3a3cc79e5e5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_result.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/interceptors_result.h
@@ -54,13 +54,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#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 */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index a5ed3483393..7ef5996a4f4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -76,11 +76,11 @@ public:
   int visit_union (be_union *node);
   // visit a union node
 
-# ifdef IDL_HAS_VALUETYPE
   int visit_valuetype (be_valuetype *node);
-  int visit_valuetype_fwd (be_valuetype_fwd *node);
-# endif /* IDL_HAS_VALUETYPE */
+  // visit a valuetype node
 
+  int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a forward declared valuetype node
 };
 
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
index 26d943d55d5..363986d5009 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
@@ -57,13 +57,11 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
+  int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  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
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 50602a01f57..a8411951b68 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
@@ -59,13 +59,11 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
+  int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  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
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index cd173c0cedb..646bb1ca643 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -55,13 +55,11 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
+  int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  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
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
index 3b0d6613299..4094f04882c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
@@ -55,13 +55,11 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
+  int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  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
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 44ee6ef34eb..6e7b0fe298e 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
@@ -56,13 +56,11 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
+  int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  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
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index ded8bb0c11c..7a720753fc4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -60,13 +60,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
 
   virtual int visit_module (be_module *node);
   // visit a module
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index ffbcc9de479..13833d3c657 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -59,13 +59,11 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
-#ifdef IDL_HAS_VALUETYPE
   virtual int visit_valuetype (be_valuetype *node);
   // visit valuetype type
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   // visit valuetype forward type
-#endif /* IDL_HAS_VALUETYPE */
 
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 6a3fd064770..1181db11cb9 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -115,11 +115,10 @@ DRV_prep_be_arg (char *s,
   const char arg_pch_include[] = "pch_include=";
   const char arg_pre_include[] = "pre_include=";
   const char arg_post_include[] = "post_include=";
-#ifdef IDL_HAS_VALUETYPE
   const char obv_opt_accessor[] = "obv_opt_accessor";
-#endif /* IDL_HAS_VALUETYPE */
 
   char* last = 0;
+
   for (char* arg = ACE_OS::strtok_r (s, ",", &last);
        arg != 0;
        arg = ACE_OS::strtok_r (0, ",", &last))
@@ -170,12 +169,10 @@ DRV_prep_be_arg (char *s,
           char* val = arg + sizeof (arg_post_include) - 1;
           be_global->post_include (val);
         }
-#  ifdef IDL_HAS_VALUETYPE
       else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg)
         {
           be_global->obv_opt_accessor (1);
         }
-#  endif /* IDL_HAS_VALUETYPE */
       else
         {
           ACE_ERROR ((LM_ERROR,
@@ -253,13 +250,11 @@ DRV_usage (void)
       ACE_TEXT (" -Gt\t\t\tenable optimized TypeCode support")
       ACE_TEXT (" (unopt by default)\n")
     ));
-#ifdef IDL_HAS_VALUETYPE
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Gv\t\t\tenable OBV (Valuetype) support")
       ACE_TEXT (" (disabled by default)\n")
     ));
-#endif /* IDL_HAS_VALUETYPE */
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -GI[h|s|b|e|c]\tGenerate Implemenation Files \n")
@@ -391,13 +386,11 @@ DRV_usage (void)
       ACE_TEXT (" -Sd\t\t\tsuppress generating Direct collocated")
       ACE_TEXT (" stubs (disable by default)\n")
     ));
-#ifdef IDL_HAS_VALUETYPE
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Sv\t\t\tdisable OBV (Valuetype) support")
       ACE_TEXT (" (disabled by default)\n")
     ));
-#endif /* IDL_HAS_VALUETYPE */
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -t\t\t\tTemporary directory to be used")
@@ -1064,19 +1057,8 @@ DRV_parse_args (long ac, char **av)
                 }
               else if (av[i][2] == 'v')
                 {
-#ifdef IDL_HAS_VALUETYPE
                   // enable OBV (Valuetype) support
                   idl_global->obv_support (1);
-#else /* IDL_HAS_VALUETYPE */
-                  {
-                    ACE_ERROR ((
-                        LM_ERROR,
-                        ACE_TEXT ("IDL: -Gv (Valuetype) not compiled in\n")
-                      ));
-
-                    ACE_OS::exit (99);
-                  }
-#endif /* IDL_HAS_VALUETYPE */
                 }
               else if (av[i][2] == 'I')
                 {
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index ed7bad1b846..0f4f085904b 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -521,8 +521,6 @@ FE_Abstract_InterfaceHeader::is_abstract (void)
   return 1;
 }
 
-// #ifdef IDL_HAS_VALUETYPE
-
 // FE_obv_header
 
 FE_obv_header::FE_obv_header (UTL_ScopedName *n,
@@ -593,4 +591,3 @@ FE_obv_header::n_concrete (void)
   return this->n_concrete_;
 }
 
-// #endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index 3dd5b277319..4a155c6b5ad 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -101,12 +101,11 @@ inline char *__yytext()
 
 static int scan_obv_token (int token)
 {
-#ifdef IDL_HAS_VALUETYPE
     if (idl_global->obv_support ())
       {
         return token;
       }
-#endif /* IDL_HAS_VALUETYPE */
+
     TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
     const TAO_IDL_CPP_Keyword_Entry *entry =
       cpp_key_tbl.lookup (ace_yytext,
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 0e63349f60f..5fbc23d512a 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -831,12 +831,11 @@ inline char *__tao_yytext()
 
 static int scan_obv_token (int token)
 {
-#ifdef IDL_HAS_VALUETYPE
     if (idl_global->obv_support ())
       {
         return token;
       }
-#endif /* IDL_HAS_VALUETYPE */
+
     TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
     const TAO_IDL_CPP_Keyword_Entry *entry =
       cpp_key_tbl.lookup (ace_tao_yytext,
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index a928e0b2637..bfcd9a2ae89 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -159,8 +159,6 @@ public:
   // See if we are a local interface.
 };
 
-// #ifdef IDL_HAS_VALUETYPE
-
 class FE_obv_header : public FE_InterfaceHeader
 {
 public:
@@ -184,6 +182,4 @@ public:
   long n_concrete_;
 };
 
-// #endif /* IDL_HAS_VALUETYPE */
-
 #endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
index 7ef753fb276..5584939d163 100644
--- a/TAO/TAO_IDL/include/idl.h
+++ b/TAO/TAO_IDL/include/idl.h
@@ -79,8 +79,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#define IDL_HAS_VALUETYPE
-
 #include        "TAO_IDL_FE_Export.h"   // Defines export macro
 #include        "idl_narrow.h"          // IDL Narrowing mechanism
 #include        "idl_defines.h"         // Constants for IDL compiler
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 090da2d7866..f2b078b55ef 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -339,10 +339,8 @@ public:
   virtual const char *ident_string (void) const;
   // Get the value of the #ident string.
 
-#ifdef IDL_HAS_VALUETYPE
   virtual void obv_support (idl_bool);
   // set enable/disable OBV (Valuetype) support
-#endif /* IDL_HAS_VALUETYPE */
 
   virtual idl_bool obv_support (void);
   // check if OBV (Valuetype) support is enabled
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 06174ab9e6b..760ee4c1d58 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -793,13 +793,11 @@ IDL_GlobalData::ident_string (void) const
   return this->ident_string_;
 }
 
-#ifdef IDL_HAS_VALUETYPE
 void
 IDL_GlobalData::obv_support (idl_bool val)
 {
   this->obv_support_ = val;
 }
-#endif /* IDL_HAS_VALUETYPE */
 
 idl_bool
 IDL_GlobalData::obv_support (void)