diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-29 09:27:36 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-07-29 09:27:36 +0000 |
| commit | 1205c12c6011e956faee399aa668966a59bef0ca (patch) | |
| tree | 060828cc7215f8e3d5d3dd554e5f84eef83d4039 | |
| parent | 6709ea92ac68281f2e1892477cb10038175b9d8c (diff) | |
| download | ATCD-1205c12c6011e956faee399aa668966a59bef0ca.tar.gz | |
ChangeLogTag: Fri Jul 29 07:18:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ace/Global_Macros.h | 24 | ||||
| -rw-r--r-- | apps/JAWS2/JAWS/Filecache.cpp | 1 | ||||
| -rw-r--r-- | apps/JAWS2/JAWS/IO.cpp | 1 | ||||
| -rw-r--r-- | apps/JAWS2/JAWS/IO_Handler.cpp | 3 |
4 files changed, 28 insertions, 1 deletions
diff --git a/ace/Global_Macros.h b/ace/Global_Macros.h index ffe95203a95..24272dd448e 100644 --- a/ace/Global_Macros.h +++ b/ace/Global_Macros.h @@ -307,6 +307,17 @@ private: } \ while (0) #endif /* defined(ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS) */ +#if defined(ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS) +# define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \ + do { \ + if (POINTER) \ + { \ + (POINTER)->~T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3> (); \ + DEALLOCATOR (POINTER); \ + } \ + } \ + while (0) +#else # define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \ do { \ if (POINTER) \ @@ -316,6 +327,18 @@ private: } \ } \ while (0) +#endif /* defined(ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS) */ +#if defined(ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS) +# define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \ + do { \ + if (POINTER) \ + { \ + (POINTER)->~T_CLASS <T_PARAM1, T_PARAM2, T_PARAM3, T_PARAM4> (); \ + DEALLOCATOR (POINTER); \ + } \ + } \ + while (0) +#else # define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3, T_PARAM4) \ do { \ if (POINTER) \ @@ -325,6 +348,7 @@ private: } \ } \ while (0) +#endif /* defined(ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS) */ # define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ do { \ if (POINTER) \ diff --git a/apps/JAWS2/JAWS/Filecache.cpp b/apps/JAWS2/JAWS/Filecache.cpp index d551542d59c..3e1eb1f6102 100644 --- a/apps/JAWS2/JAWS/Filecache.cpp +++ b/apps/JAWS2/JAWS/Filecache.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/FILE_Connector.h" +#include "ace/OS_NS_unistd.h" #include "JAWS/Filecache.h" #include "JAWS/Cache_List_T.h" diff --git a/apps/JAWS2/JAWS/IO.cpp b/apps/JAWS2/JAWS/IO.cpp index b9dddcaa0af..63e90c2ee45 100644 --- a/apps/JAWS2/JAWS/IO.cpp +++ b/apps/JAWS2/JAWS/IO.cpp @@ -3,6 +3,7 @@ #include "ace/Message_Block.h" #include "ace/SOCK_Stream.h" #include "ace/Filecache.h" +#include "ace/OS_NS_unistd.h" #include "JAWS/JAWS.h" #include "JAWS/Data_Block.h" diff --git a/apps/JAWS2/JAWS/IO_Handler.cpp b/apps/JAWS2/JAWS/IO_Handler.cpp index 67710d0f543..d1025269799 100644 --- a/apps/JAWS2/JAWS/IO_Handler.cpp +++ b/apps/JAWS2/JAWS/IO_Handler.cpp @@ -2,6 +2,7 @@ #include "ace/Proactor.h" #include "ace/Filecache.h" +#include "ace/OS_NS_unistd.h" #include "JAWS/JAWS.h" #include "JAWS/IO.h" @@ -336,7 +337,7 @@ JAWS_Asynch_Handler::open (ACE_HANDLE h, ACE_Asynch_Accept_Result_Impl *fake_result = ACE_Proactor::instance ()->create_asynch_accept_result - (*this, JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (), + (this->proxy (), JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (), h, mb, JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE, this->ioh_, ACE_INVALID_HANDLE, 0); |