diff options
Diffstat (limited to 'TAO/orbsvcs/LifeCycle_Service')
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h | 14 |
4 files changed, 26 insertions, 21 deletions
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h index e66ac7b848d..5289711965d 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h @@ -17,35 +17,35 @@ #include "orbsvcs/CosLifeCycleC.h" #include "orbsvcs/LifeCycleServiceC.h" -#if !defined (CRITERIA_EVALUATOR_H_H) +#ifndef CRITERIA_EVALUATOR_H_H #define CRITERIA_EVALUATOR_H_H class Criteria_Evaluator// : public LifeCycleService::Criteria_Evaluator { // = TITLE - // + // public: Criteria_Evaluator (const CosLifeCycle::Criteria & criteria); ~Criteria_Evaluator (); - + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &_tao_environment); char * getFilter (CORBA::Environment &_tao_environment); - LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &_tao_environment) + LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &_tao_environment) { return 0; } - char * getPreferences (CORBA::Environment &_tao_environment) + char * getPreferences (CORBA::Environment &_tao_environment) { return 0; } private: CORBA::Any *getCriteriaMember (const CORBA::String member_name); - + const CosLifeCycle::Criteria &criteria_; }; diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h index 287f58d2e1e..6730e707e99 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h +++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h @@ -14,7 +14,7 @@ // // ============================================================================ -#if !defined (FACTORY_TRADER_H) +#ifndef FACTORY_TRADER_H #define FACTORY_TRADER_H #include "tao/corba.h" @@ -23,7 +23,7 @@ #include "orbsvcs/CosLifeCycleC.h" -class Factory_Trader +class Factory_Trader { public: Factory_Trader (); @@ -31,11 +31,11 @@ public: void add_type (); // Add a the Factory type to the repository - + void export (const char * name, - const char * location, - const char * description, - const CORBA::Object_ptr object_ptr); + const char * location, + const char * description, + const CORBA::Object_ptr object_ptr); // export a specific factory CORBA::Object_ptr query (const CORBA::String constraint); diff --git a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h index 065b10fcd24..ab24a98dc6f 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h +++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h @@ -14,10 +14,15 @@ // ============================================================================ #include "ace/Get_Opt.h" + +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ + #include "tao/TAO.h" #include "Life_Cycle_Service_i.h" -#if !defined (LIFE_CYCLE_SERVICE_H) +#ifndef LIFE_CYCLE_SERVICE_H #define IFE_CYCLE_SERVICE_H class Life_Cycle_Service_Server @@ -48,7 +53,7 @@ private: // instance of the ORB Manager Life_Cycle_Service_i *life_Cycle_Service_i_ptr_; - // Instance of the creation service + // Instance of the creation service CosNaming::NamingContext_var namingContext_var_; // reference to the naming service diff --git a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h index 93730aa7887..7b4aa4d18ba 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h +++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h @@ -17,7 +17,7 @@ #include "Factory_Trader.h" #include "Criteria_Evaluator.h" -#if !defined (LIFE_CYCLE_SERVICE_IMPL_H) +#ifndef LIFE_CYCLE_SERVICE_IMPL_H #define LIFE_CYCLE_SERVICE_IMPL_H class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service @@ -34,7 +34,7 @@ public: // Returns true if the Generic Factory is able to forward a request // for creating an object described by the <factory_key>. - CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, + CORBA::Object_ptr create_object (const CosLifeCycle::Key &factory_key, const CosLifeCycle::Criteria &the_criteria, CORBA::Environment &_env_there); // Returns an object reference to a newly created object, though the @@ -42,14 +42,14 @@ public: // request to a more concrete Factory. void register_factory (const char * name, - const char * location, - const char * description, - CORBA::Object_ptr object, - CORBA::Environment &_env_there); + const char * location, + const char * description, + CORBA::Object_ptr object, + CORBA::Environment &_env_there); // Registers a factory with specified properties private: - Factory_Trader *factory_trader_ptr_; + Factory_Trader *factory_trader_ptr_; }; #endif /* LIFE_CYCLE_SERVICE_IMPL_H */ |