diff options
author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-23 02:23:27 +0000 |
---|---|---|
committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-23 02:23:27 +0000 |
commit | 69299dd955b565481605d938d5f4b8facabe2690 (patch) | |
tree | f84fbf08af87436d1e7c7830061032c347d4e6d6 | |
parent | daba0cb76a58471b5961d7e2a2dddce9c1df0756 (diff) | |
download | ATCD-69299dd955b565481605d938d5f4b8facabe2690.tar.gz |
Wed May 23 02:21:30 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu>
-rw-r--r-- | CIAO/ChangeLog | 7 | ||||
-rw-r--r-- | CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 3132d194517..a87402c1b42 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,10 @@ +Wed May 23 02:21:30 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> + + * DAnCE/Deployment/NodeApp_CB_Impl.h: + + Added back #if defined (ACE_HAS_THREADS) macro to + fix error in single_threaded build. + Mon May 21 15:46:23 UTC 2007 Gan Deng <gan.deng@vanderbilt.edu> * DAnCE/DomainApplicationManager/Task_StartLaunch.h: diff --git a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h index 4deee09abb6..bb2bcea2465 100644 --- a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h +++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h @@ -13,6 +13,9 @@ #ifndef NODEAPPLICATION_CALLBACK_IMPL_H #define NODEAPPLICATION_CALLBACK_IMPL_H #include /**/ "ace/pre.h" +#include "ace/config-all.h" + +#if defined (ACE_HAS_THREADS) #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -83,3 +86,5 @@ namespace CIAO #include /**/ "ace/post.h" #endif /* NODEAPPLICATION_CALLBACK_IMPL_H */ + +#endif /* ACE_HAS_THREADS */
\ No newline at end of file |