diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-23 20:02:58 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-23 20:02:58 +0000 |
| commit | 8e16fdaf51550d4a567f8f31cd9822db873da6a6 (patch) | |
| tree | 18f011efe6ed82be7e3b1edc16081158564ca69f | |
| parent | 5079d6bd94b9137d34feb06227a129691f2a80a4 (diff) | |
| download | ATCD-8e16fdaf51550d4a567f8f31cd9822db873da6a6.tar.gz | |
Wed May 23 20:01:49 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
| -rw-r--r-- | CIAO/ChangeLog | 9 | ||||
| -rw-r--r-- | CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp | 5 | ||||
| -rw-r--r-- | CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h | 5 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp | 5 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h | 3 |
5 files changed, 9 insertions, 18 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 69aea25401b..99f36e852a8 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,12 @@ +Wed May 23 20:01:49 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/Deployment/NodeApp_CB_Impl.cpp: + * DAnCE/Deployment/NodeApp_CB_Impl.h: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp: + * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h: + + Removed ACE_HAS_THREADS guards. + Wed May 23 18:36:35 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> * MPC/config/ciao_deployment_stub.mpb: diff --git a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp index 0ae9cfcb9f7..68b5d858a1f 100644 --- a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp +++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp @@ -1,8 +1,5 @@ // $Id$ -#include "ace/config-all.h" - -#if defined (ACE_HAS_THREADS) #include "NodeApp_CB_Impl.h" CIAO::NodeApplication_Callback_Impl:: @@ -78,5 +75,3 @@ CIAO::NodeApplication_Callback_Impl::is_callback_completed () { return this->is_callback_completed_; } - -#endif /* ACE_HAS_THREADS */ diff --git a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h index f702ad0cd91..d8c47dceb7d 100644 --- a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h +++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h @@ -15,8 +15,6 @@ #include /**/ "ace/pre.h" #include "ace/config-all.h" -#if defined (ACE_HAS_THREADS) - #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ @@ -86,6 +84,3 @@ namespace CIAO #include /**/ "ace/post.h" #endif /* NODEAPPLICATION_CALLBACK_IMPL_H */ - -#endif /* ACE_HAS_THREADS */ - diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp index 5b59aa05deb..5976840c0c7 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp @@ -2,8 +2,6 @@ #include "NodeApplicationManager_Impl.h" -#if defined (ACE_HAS_THREADS) - #include "ace/Process.h" #include "ace/Process_Manager.h" #include "ace/Reactor.h" @@ -1102,6 +1100,3 @@ create_node_application (const ACE_CString & options) CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void) { } - -#endif /* ACE_HAS_THREADS */ - diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h index 335d1b35a54..d1297c2c000 100644 --- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h +++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h @@ -20,7 +20,6 @@ #include /**/ "ace/pre.h" #include "ace/config-all.h" -#if defined (ACE_HAS_THREADS) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -379,5 +378,3 @@ namespace CIAO #include /**/ "ace/post.h" #endif /* CIAO_NODEAPPLICATIONMANAGER_IMPL_H */ - -#endif /* ACE_HAS_THREADS */ |