summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-04-08 07:41:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-04-08 07:41:51 +0000
commit5dd0881413a1de905ec8f3ab5b4dbb8bdda59d06 (patch)
treeb84353347f94f77073382b38183b35fea50ab681
parentbbe4c518a6ab0194ad567efb0cbc9560bf8eeee7 (diff)
downloadATCD-5dd0881413a1de905ec8f3ab5b4dbb8bdda59d06.tar.gz
Thu Apr 8 07:42:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ccm/CCM_ComponentId.idl * ccm/CCM_ExecutorLocator.idl LwCCM updates
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/ccm/CCM_ComponentId.idl4
-rw-r--r--CIAO/ccm/CCM_ExecutorLocator.idl4
3 files changed, 14 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index f0d2991eaed..30c253538e6 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 8 07:42:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ccm/CCM_ComponentId.idl
+ * ccm/CCM_ExecutorLocator.idl
+ LwCCM updates
+
Thu Apr 8 07:29:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ccm/CCM_Entity2Context.idl
diff --git a/CIAO/ccm/CCM_ComponentId.idl b/CIAO/ccm/CCM_ComponentId.idl
index c8d8deabdcb..e7dbce285df 100644
--- a/CIAO/ccm/CCM_ComponentId.idl
+++ b/CIAO/ccm/CCM_ComponentId.idl
@@ -7,6 +7,8 @@
// *************** Extended Container Interfaces ***************
+#if !defined (CCM_LW)
+
module Components
{
typeprefix Components "omg.org";
@@ -31,4 +33,6 @@ module Components
raises (InvalidStateIdData);
};
};
+#endif
+
#endif /* CCM_COMPONENTID_IDL */
diff --git a/CIAO/ccm/CCM_ExecutorLocator.idl b/CIAO/ccm/CCM_ExecutorLocator.idl
index ef0ac8386d8..c0e914c350d 100644
--- a/CIAO/ccm/CCM_ExecutorLocator.idl
+++ b/CIAO/ccm/CCM_ExecutorLocator.idl
@@ -9,6 +9,8 @@
// *************** Extended Container Interfaces ***************
+#if !defined (CCM_LW)
+
module Components
{
typeprefix Components "omg.org";
@@ -25,4 +27,6 @@ module Components
raises (InvalidConfiguration);
};
};
+#endif
+
#endif /* CCM_EXECUTORLOCATOR_IDL */