diff options
| author | msmit <msmit@remedy.nl> | 2009-09-03 13:14:26 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2009-09-03 13:14:26 +0000 |
| commit | 460400b66c364a46f7a0520ee2b1872e57508620 (patch) | |
| tree | 404c8f5d98badea3ce5d1bc52ef9583b896e0bc4 | |
| parent | 03814ca2d7de820286ce6061586bdfffda79f816 (diff) | |
| download | ATCD-460400b66c364a46f7a0520ee2b1872e57508620.tar.gz | |
Thu Sep 3 13:17:52 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/AMI_CCM/AMI/AMI_exec.cpp:
* connectors/AMI_CCM/Hello_Base/Hello_Base.mpc:
* connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
Resolved compiler errors on Windows.
4 files changed, 12 insertions, 4 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog index 6f6fd9db1c9..509f2d7fe0c 100644 --- a/modules/CIAO/ChangeLog +++ b/modules/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 3 13:17:52 UTC 2009 Marcel Smit <msmit@remedy.nl> + + * connectors/AMI_CCM/AMI/AMI_exec.cpp: + * connectors/AMI_CCM/Hello_Base/Hello_Base.mpc: + * connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp: + Resolved compiler errors on Windows. + Thu Sep 3 12:05:43 UTC 2009 Marcel Smit <msmit@remedy.nl> * ciao/ComponentServer/CIAO_ComponentInstallation_Impl.cpp: diff --git a/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp index da6de6fbeb3..f84da8ceeb3 100644 --- a/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp +++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp @@ -32,6 +32,7 @@ #include "ciao/CIAO_common.h" #include "AMI_MyFoo_i.h" #include "AMI_MyInterface_i.h" +#include "ace/OS_NS_unistd.h" namespace CIAO_Hello_AMI_AMI_Impl { diff --git a/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc index 43387d91a5f..12dfd08220a 100644 --- a/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc +++ b/modules/CIAO/connectors/AMI_CCM/Hello_Base/Hello_Base.mpc @@ -37,7 +37,7 @@ project(Hello_Base_stub) : ccm_stub, ami { sharedname = Hello_Base_stub - dynamicflags = HELLO_BASE_STUB_BUILD_DLL + dynamicflags = HELLO_BASE_STUB_BUILD_DLL HELLO_STUB_BUILD_DLL IDL_Files { } @@ -62,14 +62,14 @@ project(Hello_Base_stub) : ccm_stub, ami { project(Hello_Base_skel) : ciao_executor, ami { - after += Hello_Base_stub Hello_Base_lem_stub + after += Hello_Base_stub sharedname = Hello_Base_skel libs += Hello_Base_stub libout = ../lib libpaths += ../lib - dynamicflags = HELLO_BASE_SKEL_BUILD_DLL + dynamicflags = HELLO_BASE_SKEL_BUILD_DLL HELLO_SKEL_BUILD_DLL IDL_Files { } diff --git a/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp index 880dd6d8ad6..abc08fcff35 100644 --- a/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp +++ b/modules/CIAO/connectors/AMI_CCM/Receiver/Hello_Receiver_exec.cpp @@ -107,7 +107,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl { printf ("Receiver :\tReceived short <%d>\n", something); ACE_OS::sleep (ACE_OS::rand () % 2); - return something / 6.54321; + return static_cast<CORBA::Float>(something / 6.54321); } } |