summaryrefslogtreecommitdiff
path: root/CIAO/ccm
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-09-29 10:22:04 +0000
committermsmit <msmit@remedy.nl>2010-09-29 10:22:04 +0000
commitfb87d6fd6eb22d908859bfc46f2090b7c731243c (patch)
tree9d34a233da6a2f7533c174aa4745b7227c30a9a4 /CIAO/ccm
parent41fdc68ba1bf5f4bd9647b59e3d48d8532eccd02 (diff)
downloadATCD-fb87d6fd6eb22d908859bfc46f2090b7c731243c.tar.gz
Wed Sep 29 10:23:38 UTC 2010 Marcel Smit <msmit@remedy.nl>
* ccm/CCM_CCMException.idl: * ciao/Containers/Container_Base_T.cpp: * ciao/Containers/Extension/Extension_Container.h: * ciao/Containers/Extension/Extension_Container.idl: * ciao/Containers/Extension/Extension_Container.cpp: Added and implemented install_service_reference, uninstall_service_reference, and, resolve_service_reference. * ciao/Containers/Servant_Activator.h: * ciao/Contexts/Extension/Extension_Context_T.cpp: Calling new implemented methods (install_service_refence and uninstall_service_reference). * ciao/Servants/Connector_Servant_Impl_Base.h: * ciao/Servants/Connector_Servant_Impl_Base.cpp: * ciao/Servants/Connector_Servant_Impl_Utils_T.cpp: * ciao/Servants/Servant_Impl_Base.h: * ciao/Servants/Servant_Impl_Base.cpp: * ciao/Servants/Servant_Impl_Utils_T.cpp: Replaced ACE_Array_Map with a std::map.
Diffstat (limited to 'CIAO/ccm')
-rw-r--r--CIAO/ccm/CCM_CCMException.idl6
1 files changed, 2 insertions, 4 deletions
diff --git a/CIAO/ccm/CCM_CCMException.idl b/CIAO/ccm/CCM_CCMException.idl
index ade65f33b49..729a08974b1 100644
--- a/CIAO/ccm/CCM_CCMException.idl
+++ b/CIAO/ccm/CCM_CCMException.idl
@@ -16,13 +16,11 @@ module Components
DUPLICATE_KEY,
FIND_ERROR,
OBJECT_NOT_FOUND,
- NO_SUCH_ENTITY
-#if !defined (CCM_LW)
+ NO_SUCH_ENTITY,
// Coming from QoS4CCM
- ,QOS_ERROR,
+ QOS_ERROR,
REGISTRATION_ERROR,
SERVICE_INSTALLATION_ERROR
-#endif
};
exception CCMException