diff options
| author | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:09:11 +0000 |
|---|---|---|
| committer | doccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:09:11 +0000 |
| commit | 2c25b795ac89dc7d2f18077b8e9f6c6133722fe9 (patch) | |
| tree | 02eb34c1ef1319b464fb07d6985c622a135d13be | |
| parent | a94ee7480a02e0080f55a6336116833fb5f77e54 (diff) | |
| download | ATCD-2c25b795ac89dc7d2f18077b8e9f6c6133722fe9.tar.gz | |
ChangeLogTag: Aug 25 16:51:17 2000 Priyanka Gontla <pgontla@ece.uci.edu>
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h | 9 |
4 files changed, 16 insertions, 7 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp index 79e8423b269..199cbc2710b 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp @@ -260,7 +260,7 @@ TAO_CEC_Event_Loader::fini (void) return 0; } -ACE_SVC_FACTORY_DEFINE (TAO_CEC_Event_Loader) +ACE_FACTORY_DEFINE (TAO_Event, TAO_CEC_Event_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_CEC_Event_Loader>; diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index f13e4afedf6..52994cba4fa 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -23,7 +23,7 @@ #include "CEC_EventChannel.h" #include "orbsvcs/CosNamingC.h" -class ACE_Svc_Export TAO_CEC_Event_Loader : public TAO_Object_Loader +class TAO_Event_Export TAO_CEC_Event_Loader : public TAO_Object_Loader { public: @@ -75,8 +75,12 @@ class ACE_Svc_Export TAO_CEC_Event_Loader : public TAO_Object_Loader // CosNaming::Name CosNaming::Name channel_name_; + private: + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &)) + }; -ACE_SVC_FACTORY_DECLARE (TAO_CEC_Event_Loader) +ACE_FACTORY_DECLARE (TAO_Event, TAO_CEC_Event_Loader) #endif /* TAO_CEC_EVENT_LOADER_H */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index f27b9cace71..8a279b50614 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -447,9 +447,9 @@ TAO_Trading_Loader::parse_args (int &argc, char *argv []) return 0; } -ACE_SVC_FACTORY_DEFINE (TAO_Trading_Loader) +ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader); -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Trading_Loader>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Dynamic_Service<TAO_Trading_Loader> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 6ec25aded93..8c72e3b9e7f 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -28,7 +28,7 @@ #include "orbsvcs/Trader/Trader.h" #include "orbsvcs/Trader/Service_Type_Repository.h" -class ACE_Svc_Export TAO_Trading_Loader : public TAO_Object_Loader +class TAO_Trading_Export TAO_Trading_Loader : public TAO_Object_Loader { public: @@ -98,8 +98,13 @@ public: CORBA::Boolean dumpior_; // Flag indication whether to dump the ior to standard output + + private: + ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader (const TAO_Trading_Loader &)) + ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader &operator= (const TAO_Trading_Loader &)) + }; -ACE_SVC_FACTORY_DECLARE (TAO_Trading_Loader) +ACE_FACTORY_DECLARE (TAO_Trading, TAO_Trading_Loader) #endif /* TAO_TRADING_LOADER_H */ |