ChangeLogTag: Fri Dec 13 11:48:24 2002 Jeff Parsons <j.parsons@vanderbilt.edu>

8 files changed, 100 insertions, 23 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2a644dc2f1f..e1424e6035a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,16 @@
+Fri Dec 13 11:48:24 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+
+          Fixed various minor errors - preprocessor directive syntax,
+          throw spec agreement, and unused variables.
+
 Thu Dec 12 23:45:14 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 73a9a5343af..304ee27f298 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -91,14 +91,12 @@ TAO_AliasDef_i::original_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
                                             "original_type",
                                             original_type);
 
-  CORBA::DefinitionKind def_kind = this->path_to_def_kind (original_type);
-
   CORBA::Object_var obj = this->path_to_ir_object (original_type
                                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::IDLType::_nil ());
 
   return CORBA::IDLType::_narrow (obj.in ()
-                                 ACE_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
index f001daec17b..632f7b318a6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -166,28 +166,28 @@ TAO_ComponentRepository_i::create_servants_and_poas (
   ACE_CHECK_RETURN (-1);
 
 #define GEN_IR_OBJECT(name) \
-  this-> ## name ## _poa_ = \
+  this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
                                  policies \
                                  ACE_ENV_ARG_PARAMETER); \
   ACE_CHECK_RETURN (-1); \
-  TAO_ ## name ## _i * ## name ## _impl = 0; \
+  TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
                   TAO_ ## name ## _i (this), \
                   -1); \
-  ACE_NEW_RETURN (this-> ## name ## _servant_, \
-                  POA_IR:: ## name ## _tie<TAO_ ## name ## _i> ( \
+  ACE_NEW_RETURN (this-> name ## _servant_, \
+                  POA_IR:: name ## _tie<TAO_ ## name ## _i> ( \
                       name ## _impl, \
-                      this-> ## name ## _poa_, \
+                      this-> name ## _poa_.in (), \
                       1 \
                     ), \
                   -1); \
   PortableServer::ServantBase_var name ## _safety ( \
-      this-> ## name ## _servant_ \
+      this-> name ## _servant_ \
     ); \
-  this-> ## name ## _poa_->set_servant (this-> ## name ## _servant_ \
-                                        ACE_ENV_ARG_PARAMETER); \
+  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
+                                     ACE_ENV_ARG_PARAMETER); \
   ACE_CHECK_RETURN (-1);
 
   CONCRETE_IR_OBJECT_TYPES
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
index fa2aeaf7228..292c8dfad73 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -148,7 +148,7 @@ protected:
   GEN_IR_OBJECT (UsesDef)
 
 #define GEN_IR_OBJECT(name) \
-  POA_IR:: ## name ## _tie<TAO_ ## name ## _i> * ## name ## _servant_; \
+  POA_IR:: name ## _tie<TAO_ ## name ## _i> * name ## _servant_; \
   PortableServer::POA_var name ## _poa_;
 
   CONCRETE_IR_OBJECT_TYPES
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index d21d1ae02c7..530ef8158d9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -31,6 +31,7 @@ TAO_IRObject_i::section_key (ACE_Configuration_Section_Key &key)
 
 void
 TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
     this->repo_->poa_current ()->get_object_id ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 2a9dd0babde..7a67899eb73 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -793,27 +793,27 @@ TAO_Repository_i::create_servants_and_poas (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (-1);
 
 #define GEN_IR_OBJECT(name) \
-  this-> ## name ## _poa_ = \
+  this-> name ## _poa_ = \
     this->root_poa_->create_POA (#name "_poa", \
                                  poa_manager.in (), \
                                  policies \
                                  ACE_ENV_ARG_PARAMETER); \
   ACE_CHECK_RETURN (-1); \
-  TAO_ ## name ## _i * ## name ## _impl = 0; \
+  TAO_ ## name ## _i * name ## _impl = 0; \
   ACE_NEW_RETURN (name ## _impl, \
                   TAO_ ## name ## _i (this), \
                   -1); \
-  ACE_NEW_RETURN (this-> ## name ## _servant_, \
-                  POA_CORBA:: ## name ## _tie<TAO_ ## name ## _i> ( \
+  ACE_NEW_RETURN (this-> name ## _servant_, \
+                  POA_CORBA:: name ## _tie<TAO_ ## name ## _i> ( \
                       name ## _impl, \
-                      this-> ## name ## _poa_, \
+                      this-> name ## _poa_.in (), \
                       1 \
                     ), \
                   -1); \
   PortableServer::ServantBase_var name ## _safety ( \
-      this-> ## name ## _servant_ \
+      this-> name ## _servant_ \
     ); \
-  this-> ## name ## _poa_->set_servant (this-> ## name ## _servant_ \
+  this-> name ## _poa_->set_servant (this-> name ## _servant_ \
                                         ACE_ENV_ARG_PARAMETER); \
   ACE_CHECK_RETURN (-1);
 
@@ -892,7 +892,7 @@ TAO_Repository_i::select_container (CORBA::DefinitionKind def_kind) const
     case CORBA::dk_Module:
       return this->ModuleDef_servant_->_tied_object ();
     case CORBA::dk_Repository:
-      return ACE_const_cast (TAO_Container_i *, this);
+      return ACE_const_cast (TAO_Repository_i *, this);
     case CORBA::dk_Struct:
       return this->StructDef_servant_->_tied_object ();
     case CORBA::dk_Union:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index 844bbe8e254..bf35caaa3ad 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -358,13 +358,80 @@ protected:
   GEN_IR_OBJECT (WstringDef)
 
 #define GEN_IR_OBJECT(name) \
-  POA_CORBA:: ## name ## _tie<TAO_ ## name ## _i> * ## name ## _servant_; \
+  POA_CORBA:: name ## _tie<TAO_ ## name ## _i> * name ## _servant_; \
   PortableServer::POA_var name ## _poa_;
 
   CONCRETE_IR_OBJECT_TYPES
 
 #undef GEN_IR_OBJECT
 
+/*
+POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i> *AbstractInterfaceDef_servant_;
+PortableServer::POA_var AbstractInterfaceDef_poa_;
+
+POA_CORBA::AliasDef_tie<TAO_AliasDef_i> *AliasDef_servant_;
+PortableServer::POA_var AliasDef_poa_;
+
+POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i> *ArrayDef_servant_;
+PortableServer::POA_var ArrayDef_poa_;
+
+POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i> *AttributeDef_servant_;
+PortableServer::POA_var AttributeDef_poa_;
+
+POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i> *ConstantDef_servant_;
+PortableServer::POA_var ConstantDef_poa_;
+
+POA_CORBA::EnumDef_tie<TAO_EnumDef_i> *EnumDef_servant_;
+PortableServer::POA_var EnumDef_poa_;
+
+POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i> *ExceptionDef_servant_;
+PortableServer::POA_var ExceptionDef_poa_;
+
+POA_CORBA::FixedDef_tie<TAO_FixedDef_i> *FixedDef_servant_;
+PortableServer::POA_var FixedDef_poa_;
+
+POA_CORBA::InterfaceDef_tie<TAO_InterfaceDef_i> *InterfaceDef_servant_;
+PortableServer::POA_var InterfaceDef_poa_;
+
+POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i> *LocalInterfaceDef_servant_;
+PortableServer::POA_var LocalInterfaceDef_poa_;
+
+POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i> *ModuleDef_servant_;
+PortableServer::POA_var ModuleDef_poa_;
+
+POA_CORBA::NativeDef_tie<TAO_NativeDef_i> *NativeDef_servant_;
+PortableServer::POA_var NativeDef_poa_;
+
+POA_CORBA::OperationDef_tie<TAO_OperationDef_i> *OperationDef_servant_;
+PortableServer::POA_var OperationDef_poa_;
+
+POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i> *PrimitiveDef_servant_;
+PortableServer::POA_var PrimitiveDef_poa_;
+
+POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i> *SequenceDef_servant_;
+PortableServer::POA_var SequenceDef_poa_;
+
+POA_CORBA::StringDef_tie<TAO_StringDef_i> *StringDef_servant_;
+PortableServer::POA_var StringDef_poa_;
+
+POA_CORBA::StructDef_tie<TAO_StructDef_i> *StructDef_servant_;
+PortableServer::POA_var StructDef_poa_;
+
+POA_CORBA::UnionDef_tie<TAO_UnionDef_i> *UnionDef_servant_;
+PortableServer::POA_var UnionDef_poa_;
+
+POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i> *ValueBoxDef_servant_;
+PortableServer::POA_var ValueBoxDef_poa_;
+
+POA_CORBA::ValueDef_tie<TAO_ValueDef_i> *ValueDef_servant_;
+PortableServer::POA_var ValueDef_poa_;
+
+POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i> *ValueMemberDef_servant_;
+PortableServer::POA_var ValueMemberDef_poa_;
+
+POA_CORBA::WstringDef_tie<TAO_WstringDef_i> *WstringDef_servant_;
+PortableServer::POA_var WstringDef_poa_;
+*/
 private:
   static const char *TAO_IFR_primitive_kinds[];
   // Set of strings corresponding to the CORBA::PrimitiveKind
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 456fa0f538e..f4150203505 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -251,8 +251,6 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_TString name, path;
   ACE_Configuration_Section_Key next_key, entry_key;
-  u_int kind = 0;
-  CORBA::DefinitionKind def_kind = CORBA::dk_none;
   CORBA::Object_var obj;
   TAO_IDLType_i *impl = 0;