summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-04-09 07:31:36 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-04-09 07:31:36 +0000
commit50708d3df45fa87843fc9c65d037a2d2345902d8 (patch)
tree268de83b5349324c124bf774d74ead776f33340d
parenta253e75f7fca4308123b45d64cc57283afdb96e4 (diff)
downloadATCD-50708d3df45fa87843fc9c65d037a2d2345902d8.tar.gz
Fri Apr 9 07:32:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ccm/CCM_HomeRegistration.idl: * ccm/CCM_ProxyHomeRegistration.idl: Disable these interfaces with LwCCM
-rw-r--r--CIAO/ChangeLog10
-rw-r--r--CIAO/ccm/CCM_HomeRegistration.idl6
-rw-r--r--CIAO/ccm/CCM_ProxyHomeRegistration.idl5
3 files changed, 18 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 0ff410b7ed2..11f17104834 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,11 +1,17 @@
+Fri Apr 9 07:32:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ccm/CCM_HomeRegistration.idl:
+ * ccm/CCM_ProxyHomeRegistration.idl:
+ Disable these interfaces with LwCCM
+
Thu Apr 8 19:03:20 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
* examples/Hello/Sender/Sender_exec.cpp:
* examples/Hello/Sender/Sender_exec.h:
-
+
Updated hand-crafted executor to reflect the additional attriutes
added in
-
+
Wed Apr 7 16:48:30 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
Thu Apr 8 12:02:35 UTC 2010 Marcel Smit <msmit@remedy.nl>
diff --git a/CIAO/ccm/CCM_HomeRegistration.idl b/CIAO/ccm/CCM_HomeRegistration.idl
index c6f69ed6c43..987e1975327 100644
--- a/CIAO/ccm/CCM_HomeRegistration.idl
+++ b/CIAO/ccm/CCM_HomeRegistration.idl
@@ -5,6 +5,8 @@
#include "ccm/CCM_Home.idl"
+#if !defined (CCM_LW)
+
module Components
{
typeprefix Components "omg.org";
@@ -16,6 +18,8 @@ module Components
void unregister_home (in CCMHome home_ref);
};
-
};
+
+#endif
+
#endif /* CCM_HOMEREGISTRATION_IDL */
diff --git a/CIAO/ccm/CCM_ProxyHomeRegistration.idl b/CIAO/ccm/CCM_ProxyHomeRegistration.idl
index 3f613d7c13f..597d51781d9 100644
--- a/CIAO/ccm/CCM_ProxyHomeRegistration.idl
+++ b/CIAO/ccm/CCM_ProxyHomeRegistration.idl
@@ -5,6 +5,8 @@
#include "ccm/CCM_HomeRegistration.idl"
+#if !defined (CCM_LW)
+
module Components
{
typeprefix Components "omg.org";
@@ -20,4 +22,7 @@ module Components
ProxyHomeNotSupported);
};
};
+
+#endif
+
#endif /* CCM_PROXYHOMEREGISTRATION_IDL */