diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-18 13:47:58 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-18 13:47:58 +0000 |
| commit | 7f06bd06c70834161fec587f219153e33dfabdea (patch) | |
| tree | 34b3487d13bbc555efa8eca5db46b7c47ca9bb51 /modules/CIAO/performance-tests | |
| parent | 91975c1a113209c1dbc7544d868dc8ed7a1390c2 (diff) | |
| download | ATCD-7f06bd06c70834161fec587f219153e33dfabdea.tar.gz | |
Thu Jun 18 13:37:02 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
* examples/BasicSP/BasicSP.mpc
* performance-tests/Protocols/Receiver/Receiver.mpc
* performance-tests/Protocols/Sender/Sender_exec.h
Compile fixes
Diffstat (limited to 'modules/CIAO/performance-tests')
| -rw-r--r-- | modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc | 2 | ||||
| -rw-r--r-- | modules/CIAO/performance-tests/Protocols/Sender/Sender_exec.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc index fcbd5b34c05..32a38ba88f1 100644 --- a/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc +++ b/modules/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc @@ -8,7 +8,7 @@ project(Protocols_Receiver_idl_gen) : componentidldefaults, anytypecode, avoids_ -Wb,skel_export_macro=RECEIVER_SVNT_Export \ -Wb,skel_export_include=Receiver_svnt_export.h \ -Wb,exec_export_macro=RECEIVER_EXEC_Export \ - -Wb,exec_export_include=Receiver_exec_export.h \ + -Wb,exec_export_include=Receiver_exec_export.h IDL_Files { Receiver.idl diff --git a/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec.h b/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec.h index dc4859eabe4..82ec9138925 100644 --- a/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec.h +++ b/modules/CIAO/performance-tests/Protocols/Sender/Sender_exec.h @@ -9,7 +9,7 @@ class Custom_Network_Priority_Mapping; namespace CIDL_SenderImpl { class SENDER_EXEC_Export SenderExec_i : - public virtual CIAO_Protocols_Sender_Impl::Sender_Exec, + public virtual ::CIAO_Protocols_Sender_Impl::Sender_Exec, public virtual ::CORBA::LocalObject { public: @@ -42,8 +42,7 @@ namespace CIDL_SenderImpl void configuration_complete (void); protected: - - SenderExec_Context_var context_; + Sender_Exec_Context_var context_; CORBA::ORB_var orb_; |