diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-11-26 22:37:16 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-11-26 22:37:16 +0000 |
| commit | d6fa4f457414c853e173ed7dfc6506edf5b1a60f (patch) | |
| tree | b29f9628497525c26a9014dfc33d66d58b2a018c | |
| parent | ca567debe17e5052e8bb485ef2b0e931d5cad232 (diff) | |
| download | ATCD-d6fa4f457414c853e173ed7dfc6506edf5b1a60f.tar.gz | |
ChangeLogTag: Fri Nov 26 22:35:09 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl | 4 | ||||
| -rw-r--r-- | CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index f5d0302d0ac..502fdbfb594 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 26 22:35:09 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl: + * connectors/ami4ccm/examples/Hello/Base/Hello.idl: + + Changes to the #pragma directives necessary to reflect the + recent changes in AMI4CCM reply handler generation. + Fri Nov 26 19:04:11 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/DDS_Base_Connector_T.h: diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl index 350d7579537..12bb83d559d 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl +++ b/CIAO/connectors/ami4ccm/examples/Hello/Base/Hello.idl @@ -5,8 +5,8 @@ #pragma ciao lem "Base/HelloE.idl" #pragma ciao ami4ccm interface "Hello::MyFoo" -#pragma ciao lem "Base/HelloAE.idl" -#pragma ciao ami4ccm idl "Base/HelloA.idl" +//#pragma ciao lem "Base/HelloAE.idl" +//#pragma ciao ami4ccm idl "Base/HelloA.idl" module Hello { diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl index 993f1c80171..beceece1f96 100644 --- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl +++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.idl @@ -5,7 +5,7 @@ #include <Components.idl> -#include "Base/Hello.idl" +#include "Base/HelloA.idl" #pragma ciao ami4ccm receptacle "Hello::Sender::run_my_foo" |