diff options
| author | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-08-01 16:01:42 +0000 |
|---|---|---|
| committer | iliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-08-01 16:01:42 +0000 |
| commit | c84334a505ef36bf6b555bd43951a64c83ad6628 (patch) | |
| tree | fb04daf74388e1ea16431a97d3c7d07d0999e881 | |
| parent | 899a90c793c49bb4427afc9dfc8f83522a588276 (diff) | |
| download | ATCD-c84334a505ef36bf6b555bd43951a64c83ad6628.tar.gz | |
Wed Aug 1 15:55:38 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/Service_Config.h | 19 |
2 files changed, 18 insertions, 8 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index a8a915f2960..b0cfed34dd4 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Aug 1 15:55:38 UTC 2007 Iliyan Jeliazkov <iliyan@ociweb.com> + + * ace/Service_Config.h: + + Added conditional compilation around template specification + since ACE_TSS declares cleanup() only in multi-threaded builds. + Wed Aug 1 12:14:17 UTC 2007 Olli Savia <ops@iki.fi> * ace/OS_NS_dirent.h: diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 169db740cf1..9bb69f5f383 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -150,14 +150,17 @@ public: /// 2980 for a description of a test case where ACE_TSS::cleanup() is /// called before ~ACE_Object_Manager. -/// Note that Borland C++ 2007 *needs* the parameter name, but I don't -/// know why ... - -template<> inline void -ACE_TSS<ACE_Service_Gestalt>::cleanup (void*ptr) -{ - ACE_UNUSED_ARG (ptr); -} +ACE_MT ( + // Since ACE_TSS<>::cleanup() is only defined in + // multithreaded builds ... + template<> inline void + ACE_TSS<ACE_Service_Gestalt>::cleanup (void*ptr) + { + // Borland C++ 2007 *needs* the parameter + // name, but it is not clear why ... + ACE_UNUSED_ARG (ptr); + } +); // ACE_MT /** |