diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Malloc_T.cpp | 13 | ||||
| -rw-r--r-- | ace/Malloc_T.h | 6 | ||||
| -rw-r--r-- | ace/OS.h | 4 | ||||
| -rw-r--r-- | ace/OS.i | 4 | ||||
| -rw-r--r-- | ace/Stream_Modules.cpp | 36 | ||||
| -rw-r--r-- | ace/Stream_Modules.h | 18 | ||||
| -rw-r--r-- | ace/ace.mdp | bin | 47104 -> 74752 bytes |
7 files changed, 79 insertions, 2 deletions
diff --git a/ace/Malloc_T.cpp b/ace/Malloc_T.cpp index 23832860b88..0ff5509338e 100644 --- a/ace/Malloc_T.cpp +++ b/ace/Malloc_T.cpp @@ -20,6 +20,12 @@ ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter (const char *pool_name) ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::ACE_Allocator_Adapter"); } +template <class MALLOC> +ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter (void) +{ + ACE_TRACE ("ACE_Allocator_Adapter<MALLOC>::~ACE_Allocator_Adapter"); +} + template <class MALLOC> void ACE_Allocator_Adapter<MALLOC>::dump (void) const { @@ -177,6 +183,13 @@ ACE_Malloc<ACE_MEM_POOL_2, LOCK>::ACE_Malloc (const char *pool_name, } #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ + +template <ACE_MEM_POOL_1, class LOCK> +ACE_Malloc<ACE_MEM_POOL_2, LOCK>::~ACE_Malloc (void) +{ + ACE_TRACE ("ACE_Malloc<MEM_POOL>::~ACE_Malloc<MEM_POOL>"); +} + // Clean up the resources allocated by ACE_Malloc. template <ACE_MEM_POOL_1, class LOCK> int diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index ec892378180..56998bf80f7 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -53,6 +53,9 @@ public: } // Constructor (this has to be inline to avoid bugs with some C++ compilers. + ~ACE_Allocator_Adapter (void); + // Destructor + // = Memory Management virtual void *malloc (size_t nbytes); @@ -179,6 +182,9 @@ public: // compilers. #endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ + ~ACE_Malloc (void); + // Destructor + int remove (void); // Releases resources allocated by ACE_Malloc. @@ -1614,6 +1614,10 @@ typedef fd_set ACE_FD_SET_TYPE; #define GETVAL 0 #endif /* GETVAL */ +#if !defined (F_GETFL) +#define F_GETFL 0 +#endif /* F_GETFL */ + #if !defined (SETVAL) #define SETVAL 0 #endif /* SETVAL */ @@ -4841,7 +4841,7 @@ ACE_OS::execvp (const char *file, char *const argv[]) } ACE_INLINE int -ACE_OS::execl (const char */* path */, const char */* arg0 */, ...) +ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...) { // ACE_TRACE ("ACE_OS::execl"); #if defined (ACE_WIN32) || defined (VXWORKS) @@ -4854,7 +4854,7 @@ ACE_OS::execl (const char */* path */, const char */* arg0 */, ...) } ACE_INLINE int -ACE_OS::execle (const char */* path */, const char * /* arg0 */, ...) +ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...) { // ACE_TRACE ("ACE_OS::execle"); #if defined (ACE_WIN32) || defined (VXWORKS) diff --git a/ace/Stream_Modules.cpp b/ace/Stream_Modules.cpp index 53428b31305..f136e9431df 100644 --- a/ace/Stream_Modules.cpp +++ b/ace/Stream_Modules.cpp @@ -13,6 +13,18 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Head) +template <ACE_SYNCH_1> +ACE_Stream_Head<ACE_SYNCH_2>::ACE_Stream_Head (void) +{ + ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_2>::ACE_Stream_Head"); +} + +template <ACE_SYNCH_1> +ACE_Stream_Head<ACE_SYNCH_2>::~ACE_Stream_Head (void) +{ + ACE_TRACE ("ACE_Stream_Head<ACE_SYNCH_2>::~ACE_Stream_Head"); +} + template <ACE_SYNCH_1> void ACE_Stream_Head<ACE_SYNCH_2>::dump (void) const { @@ -139,6 +151,18 @@ ACE_Stream_Head<ACE_SYNCH_2>::fini (void) ACE_ALLOC_HOOK_DEFINE(ACE_Stream_Tail) +template <ACE_SYNCH_1> +ACE_Stream_Tail<ACE_SYNCH_2>::ACE_Stream_Tail (void) +{ + ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_2>::ACE_Stream_Tail"); +} + +template <ACE_SYNCH_1> +ACE_Stream_Tail<ACE_SYNCH_2>::~ACE_Stream_Tail (void) +{ + ACE_TRACE ("ACE_Stream_Tail<ACE_SYNCH_2>::~ACE_Stream_Tail"); +} + template <ACE_SYNCH_1> void ACE_Stream_Tail<ACE_SYNCH_2>::dump (void) const { @@ -264,6 +288,18 @@ ACE_Stream_Tail<ACE_SYNCH_2>::fini (void) ACE_ALLOC_HOOK_DEFINE(ACE_Thru_Task) +template <ACE_SYNCH_1> +ACE_Thru_Task<ACE_SYNCH_2>::ACE_Thru_Task (void) +{ + ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_2>::ACE_Thru_Task"); +} + +template <ACE_SYNCH_1> +ACE_Thru_Task<ACE_SYNCH_2>::~ACE_Thru_Task (void) +{ + ACE_TRACE ("ACE_Thru_Task<ACE_SYNCH_2>::~ACE_Thru_Task"); +} + template <ACE_SYNCH_1> void ACE_Thru_Task<ACE_SYNCH_2>::dump (void) const { diff --git a/ace/Stream_Modules.h b/ace/Stream_Modules.h index 71db2247af5..bd64afbf828 100644 --- a/ace/Stream_Modules.h +++ b/ace/Stream_Modules.h @@ -26,6 +26,12 @@ class ACE_Stream_Head : public ACE_Task<ACE_SYNCH_2> // Standard module that acts as the head of a ustream. { public: + ACE_Stream_Head (); + // Construction + + ~ACE_Stream_Head (); + // Destruction + // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); @@ -55,6 +61,12 @@ class ACE_Stream_Tail : public ACE_Task<ACE_SYNCH_2> // Standard module that acts as the head of a ustream. { public: + ACE_Stream_Tail (); + // Construction + + ~ACE_Stream_Tail (); + // Destruction + // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); @@ -85,6 +97,12 @@ class ACE_Thru_Task : public ACE_Task<ACE_SYNCH_2> // data to its adjacent neighbor. { public: + ACE_Thru_Task (); + // Construction + + ~ACE_Thru_Task (); + // Destruction + // = ACE_Task hooks virtual int open (void *a = 0); virtual int close (u_long flags = 0); diff --git a/ace/ace.mdp b/ace/ace.mdp Binary files differindex ffa58663909..871da7c8c66 100644 --- a/ace/ace.mdp +++ b/ace/ace.mdp |