diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-09 08:22:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-09 08:22:26 +0000 |
| commit | 138dbdc2262a40948e1f8c9c8dbf91e315eb0da1 (patch) | |
| tree | fc143ffd0b483d15f667eb291f2928982e709e83 | |
| parent | 4b422ec8ed5e28a8a70d095c17387278f462e87f (diff) | |
| download | ATCD-138dbdc2262a40948e1f8c9c8dbf91e315eb0da1.tar.gz | |
Fri Apr 9 08:23:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ccm/CCM_Context.idl
* ccm/Security.idl
* ciao/Contexts/Context_Impl_Base.cpp
* ciao/Contexts/Context_Impl_Base.h
Disable more features with LwCCM
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/ccm/CCM_Context.idl | 4 | ||||
| -rw-r--r-- | CIAO/ccm/Security.idl | 5 | ||||
| -rw-r--r-- | CIAO/ciao/Contexts/Context_Impl_Base.cpp | 2 | ||||
| -rw-r--r-- | CIAO/ciao/Contexts/Context_Impl_Base.h | 2 |
5 files changed, 21 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c782859ba63..2927671becd 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 9 08:23:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ccm/CCM_Context.idl + * ccm/Security.idl + * ciao/Contexts/Context_Impl_Base.cpp + * ciao/Contexts/Context_Impl_Base.h + Disable more features with LwCCM + Fri Apr 9 08:07:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * ccm/CCM_Navigation.idl: diff --git a/CIAO/ccm/CCM_Context.idl b/CIAO/ccm/CCM_Context.idl index dcc1eae07ff..a9950d6a391 100644 --- a/CIAO/ccm/CCM_Context.idl +++ b/CIAO/ccm/CCM_Context.idl @@ -14,7 +14,9 @@ module Components { typeprefix Components "omg.org"; +#if !defined (CCM_LW) typedef SecurityLevel2::Credentials Principal; +#endif exception IllegalState {}; @@ -45,11 +47,13 @@ module Components raises (IllegalState); #endif +#if !defined (CCM_LW) /** * Added for QoS4CCM */ Object resolve_service_reference(in string service_id) raises (CCMException); +#endif }; }; #endif /* CCM_CONTEXT_IDL */ diff --git a/CIAO/ccm/Security.idl b/CIAO/ccm/Security.idl index ce38f2ce1aa..af51968bf1f 100644 --- a/CIAO/ccm/Security.idl +++ b/CIAO/ccm/Security.idl @@ -10,6 +10,8 @@ #if !defined (CIAO_SECURITY_IDL) #define CIAO_SECURITY_IDL +#if !defined (CCM_LW) + #pragma prefix "omg.org" module SecurityLevel2 { @@ -20,4 +22,7 @@ module SecurityLevel2 { { }; }; + +#endif + #endif /* CIAO_SECURITY_IDL */ diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.cpp b/CIAO/ciao/Contexts/Context_Impl_Base.cpp index 06a01d40353..55c008bde73 100644 --- a/CIAO/ciao/Contexts/Context_Impl_Base.cpp +++ b/CIAO/ciao/Contexts/Context_Impl_Base.cpp @@ -80,9 +80,11 @@ namespace CIAO } #endif +#if !defined (CCM_LW) CORBA::Object_ptr Context_Impl_Base::resolve_service_reference(const char *) { throw CORBA::NO_IMPLEMENT (); } +#endif } diff --git a/CIAO/ciao/Contexts/Context_Impl_Base.h b/CIAO/ciao/Contexts/Context_Impl_Base.h index 1a845c85693..4a8806a3b83 100644 --- a/CIAO/ciao/Contexts/Context_Impl_Base.h +++ b/CIAO/ciao/Contexts/Context_Impl_Base.h @@ -84,7 +84,9 @@ namespace CIAO virtual void set_rollback_only (); #endif +#if !defined (CCM_LW) virtual CORBA::Object_ptr resolve_service_reference(const char *service_id); +#endif /// CIAO-specific. CIAO::Container_ptr _ciao_the_Container (void) const; |