summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-04-13 08:52:01 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-04-13 08:52:01 +0000
commit142e66dc458b50f517f0062fbed67b0b9e6ae99c (patch)
tree2f59c7d77ac9fe98edc4be54eaefe8e49f992808
parent78d76127faaad18d989521581c85851dab39c13e (diff)
downloadATCD-142e66dc458b50f517f0062fbed67b0b9e6ae99c.tar.gz
Tue Apr 13 08:53:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IDL3/ImpliedIDL/All/convert.idl: Disabled some parts for LwCCM
-rw-r--r--CIAO/ChangeLog5
-rw-r--r--CIAO/tests/IDL3/ImpliedIDL/All/convert.idl4
2 files changed, 9 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7e904661996..29b73ae4c01 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 13 08:53:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/IDL3/ImpliedIDL/All/convert.idl:
+ Disabled some parts for LwCCM
+
Tue Apr 13 07:03:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Servants/Connector_Servant_Impl_Base.h
diff --git a/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl b/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
index 68600a619b3..a5caf420f4d 100644
--- a/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
+++ b/CIAO/tests/IDL3/ImpliedIDL/All/convert.idl
@@ -14,10 +14,12 @@ interface pface {};
interface uface {};
interface umface {};
+#if !defined (CCM_LW)
valuetype pkey : Components::PrimaryKeyBase
{
public string info;
};
+#endif
valuetype pubtype_base {};
eventtype pubtype : pubtype_base {};
@@ -42,6 +44,7 @@ home CompBaseHome supports sface manages CompBase
{
};
+#if !defined (CCM_LW)
home CompDerivedHome : CompBaseHome manages CompDerived primarykey pkey
{
exception ch_except {};
@@ -50,4 +53,5 @@ home CompDerivedHome : CompBaseHome manages CompDerived primarykey pkey
finder kitchen_sink (in string uid, in pkey key, in boolean all)
raises (ch_except);
};
+#endif