1 files changed, 15 insertions, 23 deletions

diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 7d30f48bfd2..c4644d48969 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -83,8 +83,7 @@ BE_GlobalData::BE_GlobalData (void)
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
     ccmobject_ (0),
-    gen_anyop_files_ (I_FALSE),
-    do_ccm_preproc_ (I_TRUE)
+    gen_anyop_files_ (I_FALSE)
 {
 }
 
@@ -993,18 +992,6 @@ BE_GlobalData::gen_anyop_files (idl_bool val)
   this->gen_anyop_files_ = val;
 }
 
-idl_bool
-BE_GlobalData::do_ccm_preproc (void) const
-{
-  return this->do_ccm_preproc_;
-}
-
-void
-BE_GlobalData::do_ccm_preproc (idl_bool val)
-{
-  this->do_ccm_preproc_ = val;
-}
-
 ACE_CString
 BE_GlobalData::spawn_options (void)
 {
@@ -1369,6 +1356,11 @@ BE_GlobalData::parse_args (long &i, char **av)
             // generating Direct collocated stubs.
             be_global->gen_direct_collocation (1);
           }
+        else if (av[i][2] == 'v')
+          {
+            // enable OBV (Valuetype) support.
+            idl_global->obv_support (1);
+          }
         else if (av[i][2] == 'I')
           {
             size_t options = ACE_OS::strlen(av[i]) - 3;
@@ -1451,34 +1443,34 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'a')
           {
             // suppress Any support
-            be_global->any_support (I_FALSE);
+            be_global->any_support (0);
           }
         else if (av[i][2] == 't')
           {
             // suppress typecode support
             // Anys must be suppressed as well
-            be_global->tc_support (I_FALSE);
-            be_global->any_support (I_FALSE);
+            be_global->tc_support (0);
+            be_global->any_support (0);
           }
         else if (av[i][2] == 'p')
           {
             // suppress generating Thru_POA collocated stubs
-            be_global->gen_thru_poa_collocation (I_FALSE);
+            be_global->gen_thru_poa_collocation (0);
           }
         else if (av[i][2] == 'd')
           {
             // suppress generating Direct collocated stubs
-            be_global->gen_direct_collocation (I_FALSE);
+            be_global->gen_direct_collocation (0);
           }
         else if (av[i][2] == 'c')
           {
             // suppress generating tie classes and files
             be_global->gen_tie_classes (0);
           }
-        else if (av[i][2] == 'm')
+        else if (av[i][2] == 'v')
           {
-            // disable IDL3 to IDL2 preprocessing.
-            be_global->do_ccm_preproc (I_FALSE);
+            // disable OBV (Valuetype) support
+            idl_global->obv_support (0);
           }
         else
           {
@@ -1844,7 +1836,7 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Sm\t\t\tdisable IDL3 equivalent IDL preprocessing")
+      ACE_TEXT (" -Sv\t\t\tdisable OBV (Valuetype) support")
       ACE_TEXT (" (enabled by default)\n")
     ));
 }