summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-08-24 12:20:13 +0000
committermsmit <msmit@remedy.nl>2009-08-24 12:20:13 +0000
commit998b569b713ecb8a6c9db9f5611b127e13d7a371 (patch)
treec36ca416101ac2ef5f89d6776756e182f2bd644c
parent18d99316ab4c0105f085fb5815245ab46c46595c (diff)
downloadATCD-998b569b713ecb8a6c9db9f5611b127e13d7a371.tar.gz
Mon Aug 24 12:21:50 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/AMI_CCM/AMI/AMI.mpc: * connectors/AMI_CCM/AMI/AMI_exec.cpp: Removed file since this wasn't needed.
-rw-r--r--modules/CIAO/ChangeLog6
-rw-r--r--modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc2
-rw-r--r--modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp5
3 files changed, 8 insertions, 5 deletions
diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index 6ebb91895f3..b811864541c 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Aug 24 12:21:50 UTC 2009 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/AMI_CCM/AMI/AMI.mpc:
+ * connectors/AMI_CCM/AMI/AMI_exec.cpp:
+ Removed file since this wasn't needed.
+
Mon Aug 24 11:34:05 UTC 2009 Marcel Smit <msmit@remedy.nl>
* connectors/AMI_CCM/AMI/AMI_exec.cpp:
diff --git a/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc
index 79afb4cb3a7..13bfed8cebb 100644
--- a/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI.mpc
@@ -99,7 +99,6 @@ project(Hello_Base_AMI_exec) : ciao_executor {
AMI_exec.cpp
AMI_server.cpp
AMI_perform_work.cpp
- AMI_CORBA_handler.cpp
AMI_internal_i.cpp
AMI_internalC.cpp
AMI_internalS.cpp
@@ -109,7 +108,6 @@ project(Hello_Base_AMI_exec) : ciao_executor {
AMI_exec.h
AMI_server.h
AMI_perform_work.h
- AMI_CORBA_handler.h
AMI_internal_i.h
AMI_exec_export.h
AMI_internalS.h
diff --git a/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp
index 9a662b9db3c..5efb1a93c94 100644
--- a/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp
+++ b/modules/CIAO/connectors/AMI_CCM/AMI/AMI_exec.cpp
@@ -30,7 +30,6 @@
#include "AMI_exec.h"
#include "AMI_perform_work.h"
-#include "AMI_CORBA_handler.h"
#include "ciao/CIAO_common.h"
@@ -176,7 +175,7 @@ namespace CIAO_Hello_AMI_AMI_Impl
foo_callback_ (::CCM_AMI::AMI_foo_callback::_duplicate (foo_callback)),
cookie_ (0)
{
- //initilize AMI client
+ //initialize AMI client
int argc = 2;
ACE_TCHAR **argv = new ACE_TCHAR *[argc];
argv[0] = ACE::strnew (ACE_TEXT (""));
@@ -232,7 +231,7 @@ namespace CIAO_Hello_AMI_AMI_Impl
ah->activate ();
#else
//AMI CORBA implementation.
- printf ("Start the AMI CORBA reply handler\n");
+ printf ("Start the AMI CORBA handler thread\n");
//start handler as a trhead.
AMI_CORBA_handler *amt = new AMI_CORBA_handler (
ck,