diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-12 11:39:32 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-04-12 11:39:32 +0000 |
| commit | a3214622772a280317e0cf8712aa986af50b99d0 (patch) | |
| tree | 923094c658ee5cdda9174a4b0af6157084fd7bbd | |
| parent | e1d951e6499a661f645635faed2757a1ea272987 (diff) | |
| download | ATCD-a3214622772a280317e0cf8712aa986af50b99d0.tar.gz | |
Mon Apr 12 11:40:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/IDL_Test/Cornucopia/Cornucopia.idl:
Disabled some methods for LwCCM
| -rw-r--r-- | CIAO/ChangeLog | 7 | ||||
| -rw-r--r-- | CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bae8887c666..1486c237eae 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,10 +1,15 @@ +Mon Apr 12 11:40:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/IDL_Test/Cornucopia/Cornucopia.idl: + Disabled some methods for LwCCM + Mon Apr 12 10:00:13 UTC 2010 Martin Corino <mcorino@remedy.nl> * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test_cdr.pl: * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: * DAnCE/tests/CIAO/EM-Launch-Failures/run_test.pl: * DAnCE/tests/CIAO/EM-Redeployment/run_test.pl: - + Changes to allow tests to run in multiplatform setup. Mon Apr 12 06:56:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl index 0a01f1bdf43..be2751bacfb 100644 --- a/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl +++ b/CIAO/tests/IDL_Test/Cornucopia/Cornucopia.idl @@ -51,10 +51,12 @@ interface IfConcr : IfAb long concr_op (out long value); }; +#if !defined (CCM_LW) valuetype pkey : Components::PrimaryKeyBase { public string info; }; +#endif eventtype pubtype {}; eventtype emittype {}; @@ -193,8 +195,10 @@ module HomeMod exception ch_except {}; void ch_op () raises (ch_except); factory def_init (); +#if !defined (CCM_LW) finder kitchen_sink (in string uid, in pkey key, in boolean all) raises (ch_except); +#endif }; }; |