ChangeLogTag: Fri Aug 27 10:07:17 2004 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 29 insertions, 22 deletions

diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index be0914d8d92..b98aa19dc88 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -143,7 +143,8 @@ TAO_Contained_i::id_i (const char *id
        == 0)
     {
       // Repository id already exists.
-      ACE_THROW (CORBA::BAD_PARAM (2, CORBA::COMPLETED_NO));
+      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2, 
+                                   CORBA::COMPLETED_NO));
     }
 
   // Get the old id.
@@ -248,7 +249,8 @@ TAO_Contained_i::name_i (const char *name
 
   if (exists)
     {
-      ACE_THROW (CORBA::BAD_PARAM (3, CORBA::COMPLETED_NO));
+      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
+                                   CORBA::COMPLETED_NO));
     }
 
   // Reset the local name.
@@ -532,7 +534,7 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
     {
       if (my_repo.in () != new_container)
         {
-          ACE_THROW (CORBA::BAD_PARAM (4, 
+          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4, 
                                        CORBA::COMPLETED_NO));
         }
 
@@ -558,7 +560,8 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
 
       if (my_repo.in () != your_repo.in ())
         {
-          ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
+          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
+                                       CORBA::COMPLETED_NO));
         }
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -869,7 +872,8 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
+                                           CORBA::COMPLETED_NO));
             }
         }
         case CORBA::dk_Operation:
@@ -933,7 +937,8 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
+                                           CORBA::COMPLETED_NO));
             }
         }
         case CORBA::dk_Value:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 03e213e0989..ff57fd226d8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -2590,7 +2590,7 @@ TAO_Container_i::create_value_common (
                 }
               else
                 {
-                  ACE_THROW_RETURN (CORBA::BAD_PARAM (12,
+                  ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
                                                       CORBA::COMPLETED_NO),
                                     path);
                 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
index 4a3b9f3067d..547f64f983b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -332,7 +332,7 @@ TAO_ExtValueDef_i::describe_ext_value_i (
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                                   CORBA::COMPLETED_NO),
                                 0);
             }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 80bdef8dc43..e5dffde6134 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -576,7 +576,7 @@ TAO_IFR_Service_Utils::valid_container (
 
   if (error_flag == 1)
     {
-      ACE_THROW (CORBA::BAD_PARAM (4,
+      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 4,
                                    CORBA::COMPLETED_NO));
     }
 }
@@ -616,7 +616,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
                                          holder)
        == 0)
     {
-      ACE_THROW (CORBA::BAD_PARAM (2,
+      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 2,
                                    CORBA::COMPLETED_NO));
     }
 }
@@ -663,7 +663,7 @@ TAO_IFR_Service_Utils::name_exists (
 
           if ((*checker) (member_name.fast_rep ()) != 0)
             {
-              ACE_THROW (CORBA::BAD_PARAM (3,
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 3,
                                            CORBA::COMPLETED_NO));
             }
         }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index 6b16fabefcf..7e313b4f5e8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -281,7 +281,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
 
           if (def_kind != CORBA::dk_AbstractInterface)
             {
-              ACE_THROW (CORBA::BAD_PARAM (11,
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 11,
                                            CORBA::COMPLETED_NO));
             }
         }
@@ -763,7 +763,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                           CORBA::COMPLETED_NO),
                         CORBA::OperationDef::_nil ());
     }
@@ -838,7 +838,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                               CORBA::COMPLETED_NO),
                             CORBA::OperationDef::_nil ());
         }
@@ -1250,7 +1250,7 @@ TAO_InterfaceDef_i::check_inherited (const char *name,
 
       if (inherited_name == name)
         {
-          ACE_THROW (CORBA::BAD_PARAM (5,
+          ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 5,
                                        CORBA::COMPLETED_NO));
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
index f97acafd52f..542d0f31a68 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -38,7 +38,8 @@ void
 TAO_PrimitiveDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
+                                   CORBA::COMPLETED_NO));
 }
 
 CORBA::TypeCode_ptr
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index f46dc8889ab..c57bd56ef5e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -49,7 +49,8 @@ void
 TAO_Repository_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
+  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 2,
+                                   CORBA::COMPLETED_NO));
 }
 
 CORBA::Contained_ptr
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index c5cf819239f..719a56c6e52 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -270,7 +270,7 @@ TAO_ValueDef_i::supported_interfaces_i (
             }
           else
             {
-              ACE_THROW (CORBA::BAD_PARAM (12,
+              ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 12,
                                            CORBA::COMPLETED_NO));
               return;
             }
@@ -1027,7 +1027,7 @@ TAO_ValueDef_i::describe_value_i (ACE_ENV_SINGLE_ARG_DECL)
           if (fv_desc->operations[i].mode == CORBA::OP_ONEWAY 
               && kind != CORBA::tk_void)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                                   CORBA::COMPLETED_NO),
                                 0);
             }
@@ -1647,7 +1647,7 @@ TAO_ValueDef_i::create_operation_i (
   // Oneway operations cannot have a non-void return type.
   if (mode == CORBA::OP_ONEWAY && kind != CORBA::tk_void)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                           CORBA::COMPLETED_NO),
                         CORBA::OperationDef::_nil ());
     }
@@ -1684,7 +1684,7 @@ TAO_ValueDef_i::create_operation_i (
           // Oneway operations cannot have INOUT or OUT parameters.
           if (mode == CORBA::OP_ONEWAY && params[i].mode != CORBA::PARAM_IN)
             {
-              ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+              ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                                   CORBA::COMPLETED_NO),
                                 CORBA::OperationDef::_nil ());
             }
@@ -1722,7 +1722,7 @@ TAO_ValueDef_i::create_operation_i (
       // Oneway operations cannot throw any user exceptions.
       if (mode == CORBA::OP_ONEWAY)
         {
-          ACE_THROW_RETURN (CORBA::BAD_PARAM (31,
+          ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 31,
                                               CORBA::COMPLETED_NO),
                             CORBA::OperationDef::_nil ());
         }