diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-02-10 10:42:34 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-02-10 10:42:34 +0000 |
| commit | eec21c08a5507acab6d3a913bd4cac6c919b77bf (patch) | |
| tree | f333a88cb7ef7ceb3de8c64dc04c2d7716d4c72c | |
| parent | 6d9ddea82a4a2bcdd20adcdae988715426c29c45 (diff) | |
| download | ATCD-eec21c08a5507acab6d3a913bd4cac6c919b77bf.tar.gz | |
ChangeLogTag: Fri Feb 10 09:18:39 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
126 files changed, 428 insertions, 462 deletions
diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html index f0c52e5093c..889fd4b0129 100644 --- a/ACE-INSTALL.html +++ b/ACE-INSTALL.html @@ -1303,7 +1303,8 @@ for use </li></ol> These instructions do not cover all possible build configurations. Please -see <a href="http://www.tenermerx.com/tao_bcb/index.html">http://www.tenermerx.com/tao_bcb/index.html</a> +see <a href="http://www.tenermerx.com/programming/corba/tao_bcb/index.html"> +http://www.tenermerx.com/programming/corba/tao_bcb/index.html</a> for more detailed information on building and using ACE+TAO with Borland C++ Builder. <p> diff --git a/ace/ACE.cpp b/ace/ACE.cpp index b9cf855b5c9..3964787c90d 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -214,7 +214,7 @@ ACE::select (int width, #if !defined (ACE_WIN32) if (result > 0) readfds.sync ((ACE_HANDLE) width); -#endif /* ACE_WIN64 */ +#endif /* ACE_WIN32 */ return result; } diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h index 0bea0f17b26..e4733562440 100644 --- a/ace/Asynch_IO.h +++ b/ace/Asynch_IO.h @@ -462,7 +462,7 @@ public: int priority = 0, int signal_number = ACE_SIGRTMIN); -#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) +#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) /** * Same as above but with gather support, through chaining of composite * message blocks using the continuation field. @@ -472,10 +472,10 @@ public: const void *act = 0, int priority = 0, int signal_number = ACE_SIGRTMIN); -#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) */ +#endif /* (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) && (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) */ /// Return the underlying implementation class. - // (this should be protected...) + /// @todo (this should be protected...) virtual ACE_Asynch_Operation_Impl *implementation (void) const; protected: diff --git a/ace/Auto_Event.h b/ace/Auto_Event.h index 762089e827f..d7279a13150 100644 --- a/ace/Auto_Event.h +++ b/ace/Auto_Event.h @@ -39,14 +39,14 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Auto_Event : public ACE_Event { public: - /// constructor which will create auto event + /// Constructor which will create auto event ACE_Auto_Event (int initial_state = 0, int type = USYNC_THREAD, const char *name = 0, void *arg = 0); #if defined (ACE_HAS_WCHAR) - /// constructor which will create auto event (wchar_t version) + /// Constructor which will create auto event (wchar_t version) ACE_Auto_Event (int initial_state, int type, const wchar_t *name, diff --git a/ace/Auto_IncDec_T.h b/ace/Auto_IncDec_T.h index 466463d196d..2aeefe27247 100644 --- a/ace/Auto_IncDec_T.h +++ b/ace/Auto_IncDec_T.h @@ -68,7 +68,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #if defined (__ACE_INLINE__) #include "ace/Auto_IncDec_T.inl" -// On non-Win32 platforms, this code will be inlined #endif /* __ACE_INLINE__ */ #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ace/Based_Pointer_Repository.h b/ace/Based_Pointer_Repository.h index 9e37f7524e6..5d0b1b8fe41 100644 --- a/ace/Based_Pointer_Repository.h +++ b/ace/Based_Pointer_Repository.h @@ -41,7 +41,7 @@ class ACE_Based_Pointer_Repository_Rep; class ACE_Export ACE_Based_Pointer_Repository { public: - // = Use <ACE_Null_Mutex> to allow locking while iterating. + // = Use ACE_Null_Mutex to allow locking while iterating. // = Initialization and termination methods. ACE_Based_Pointer_Repository (void); @@ -49,9 +49,9 @@ public: // = Search structure methods. /** - * Return the appropriate <base_addr> region that contains <addr>. - * Returns 1 on success and 0 if the <addr> isn't contained in any - * <base_addr> region. + * Return the appropriate @a base_addr region that contains @a addr. + * Returns 1 on success and 0 if the @a addr isn't contained in any + * @a base_addr region. */ int find (void *addr, void *&base_addr); diff --git a/ace/Based_Pointer_T.h b/ace/Based_Pointer_T.h index 70bf617ad02..1d778639211 100644 --- a/ace/Based_Pointer_T.h +++ b/ace/Based_Pointer_T.h @@ -160,15 +160,15 @@ class ACE_Based_Pointer : public ACE_Based_Pointer_Basic<CONCRETE> { public: // = Initialization method. - /// Constructor. See constructor for <ACE_Based_Pointer_Basic> for + /// Constructor. See constructor for ACE_Based_Pointer_Basic for /// details. ACE_Based_Pointer (void); /// Initialize this object using the <initial> pointer. See - /// constructor for <ACE_Based_Pointer_Basic> for details. + /// constructor for ACE_Based_Pointer_Basic for details. ACE_Based_Pointer (CONCRETE *initial); - /// Initialize this object with known <base_addr>. <dummy> is + /// Initialize this object with known @a base_addr. @a dummy is /// a dummy value used to resolve overload ambiguity and it /// otherwise ignored. ACE_Based_Pointer (const void *base_addr, int dummy); diff --git a/ace/DLL_Manager.h b/ace/DLL_Manager.h index 0e66b540a27..2bde7161251 100644 --- a/ace/DLL_Manager.h +++ b/ace/DLL_Manager.h @@ -56,7 +56,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * execution. * */ -class ACE_Export ACE_DLL_Handle +class ACE_DLL_Handle { public: @@ -254,7 +254,7 @@ private: /// Unload strategy. u_long unload_policy_; - /// Pointer to a process-wide <ACE_DLL_Manager>. + /// Pointer to a process-wide <ACE_DLL_Manager>. static ACE_DLL_Manager *instance_; #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) diff --git a/ace/Default_Constants.h b/ace/Default_Constants.h index f6bb1ea0d66..f3011c86da6 100644 --- a/ace/Default_Constants.h +++ b/ace/Default_Constants.h @@ -443,7 +443,7 @@ # define ACE_MAX_DEFAULT_PORT 65535 #endif /* ACE_MAX_DEFAULT_PORT */ -// Default number of <ACE_Event_Handler>s supported by +// Default number of ACE_Event_Handlers supported by // <ACE_Timer_Heap>. # if !defined (ACE_DEFAULT_TIMERS) # define ACE_DEFAULT_TIMERS _POSIX_TIMER_MAX diff --git a/ace/Dev_Poll_Reactor.h b/ace/Dev_Poll_Reactor.h index 109d548c128..4c19268abc8 100644 --- a/ace/Dev_Poll_Reactor.h +++ b/ace/Dev_Poll_Reactor.h @@ -842,7 +842,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * <ACE_Event_Handler> object. Returns the number of notifications + * ACE_Event_Handler object. Returns the number of notifications * purged. Returns -1 on error. */ virtual int purge_pending_notifications (ACE_Event_Handler * = 0, diff --git a/ace/Dirent.h b/ace/Dirent.h index d5f8d7e3bf6..c31f8cc20cb 100644 --- a/ace/Dirent.h +++ b/ace/Dirent.h @@ -70,15 +70,15 @@ public: * update the st_atime field of the directory each time the * directory is actually read. */ - dirent *read (void); + ACE_DIRENT *read (void); /** * Has the equivalent functionality as <readdir> except that an * <entry> and <result> buffer must be supplied by the caller to * store the result. */ - int read (struct dirent *entry, - struct dirent **result); + int read (struct ACE_DIRENT *entry, + struct ACE_DIRENT **result); // = Manipulators. /// Returns the current location associated with the directory diff --git a/ace/Dirent.inl b/ace/Dirent.inl index 1c120dad225..0a8f0b9e6e4 100644 --- a/ace/Dirent.inl +++ b/ace/Dirent.inl @@ -49,15 +49,15 @@ ACE_Dirent::~ACE_Dirent (void) ACE_OS::closedir (this->dirp_); } -ACE_INLINE dirent * +ACE_INLINE ACE_DIRENT * ACE_Dirent::read (void) { return this->dirp_ ? ACE_OS::readdir (this->dirp_) : 0; } ACE_INLINE int -ACE_Dirent::read (struct dirent *entry, - struct dirent **result) +ACE_Dirent::read (struct ACE_DIRENT *entry, + struct ACE_DIRENT **result) { return this->dirp_ ? ACE_OS::readdir_r (this->dirp_, entry, result) diff --git a/ace/Dirent_Selector.cpp b/ace/Dirent_Selector.cpp index 9a141ee9b58..0788c8d891b 100644 --- a/ace/Dirent_Selector.cpp +++ b/ace/Dirent_Selector.cpp @@ -31,9 +31,9 @@ ACE_Dirent_Selector::~ACE_Dirent_Selector (void) int ACE_Dirent_Selector::open (const ACE_TCHAR *dir, - int (*sel)(const dirent *d), - int (*cmp) (const dirent **d1, - const dirent **d2)) + int (*sel)(const ACE_DIRENT *d), + int (*cmp) (const ACE_DIRENT **d1, + const ACE_DIRENT **d2)) { n_ = ACE_OS::scandir (dir, &this->namelist_, sel, cmp); return n_; diff --git a/ace/Dirent_Selector.h b/ace/Dirent_Selector.h index 8ffa8d71dca..89b2eead630 100644 --- a/ace/Dirent_Selector.h +++ b/ace/Dirent_Selector.h @@ -45,7 +45,7 @@ public: int length (void) const; /// Return the entry at @a index. - dirent *operator[] (const int index) const; + ACE_DIRENT *operator[] (const int index) const; /// Free up resources. int close (void); @@ -53,14 +53,14 @@ public: /// Open the directory @a dir and populate the <namelist_> array with /// directory entries that match the @a selector and @a comparator. int open (const ACE_TCHAR *dir, - int (*selector)(const dirent *d) = 0, - int (*comparator)(const dirent **d1, const dirent **d2) = 0); + int (*selector)(const ACE_DIRENT *d) = 0, + int (*comparator)(const ACE_DIRENT **d1, const ACE_DIRENT **d2) = 0); protected: /// Ptr to the namelist array. - dirent **namelist_; + ACE_DIRENT **namelist_; - /// # of entries in the array. + /// Number of entries in the array. int n_; }; diff --git a/ace/Dirent_Selector.inl b/ace/Dirent_Selector.inl index d48f2a04d2c..7c42f46b9be 100644 --- a/ace/Dirent_Selector.inl +++ b/ace/Dirent_Selector.inl @@ -10,7 +10,7 @@ ACE_Dirent_Selector::length (void) const return n_; } -ACE_INLINE dirent * +ACE_INLINE ACE_DIRENT * ACE_Dirent_Selector::operator[] (const int n) const { return this->namelist_[n]; diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h index a22ed092bd3..a72fe6c970c 100644 --- a/ace/Event_Handler.h +++ b/ace/Event_Handler.h @@ -177,7 +177,7 @@ public: * non-sockets (such as ACE_STDIN). This is commonly used in * situations where the Reactor is used to demultiplex read events * on ACE_STDIN on UNIX. Note that <event_handler> must be a - * subclass of <ACE_Event_Handler>. If the <get_handle> method of + * subclass of ACE_Event_Handler. If the <get_handle> method of * this event handler returns <ACE_INVALID_HANDLE> we default to * reading from ACE_STDIN. */ diff --git a/ace/File_Lock.h b/ace/File_Lock.h index c30f8e83e97..686fee3e0df 100644 --- a/ace/File_Lock.h +++ b/ace/File_Lock.h @@ -120,11 +120,11 @@ public: */ int tryacquire_read (short whence = 0, off_t start = 0, off_t len = 1); - /// Get underlying <ACE_HANDLE> for the file. + /// Get underlying ACE_HANDLE for the file. ACE_HANDLE get_handle (void) const; /** - * Set underlying <ACE_HANDLE>. Note that this method assumes + * Set underlying ACE_HANDLE. Note that this method assumes * ownership of the <handle> and will close it down in <remove>. If * you want the <handle> to stay open when <remove> is called make * sure to call <dup> on the <handle> before closing it. You are diff --git a/ace/Framework_Component.h b/ace/Framework_Component.h index 5d1af80b004..d0d2e6f89e2 100644 --- a/ace/Framework_Component.h +++ b/ace/Framework_Component.h @@ -9,7 +9,7 @@ * A prototype mechanism that allows framework components, singletons * such as ACE_Reactor, ACE_Proactor, etc, to be registered with a * central repository managed by the <ACE_Object_Manager> or - * <ACE_Service_Config> that will handle destruction. + * ACE_Service_Config that will handle destruction. * * This technique obviates changing ACE_Object_Manager and * ACE_Service_Config everytime a new framework is added. Which also @@ -74,6 +74,11 @@ protected: virtual ~ACE_Framework_Component (void); private: + // No copy possible + ACE_Framework_Component (const ACE_Framework_Component &); + void operator= (const ACE_Framework_Component &); + +private: /// Pointer to the actual component. const void *this_; diff --git a/ace/Free_List.h b/ace/Free_List.h index 726e7fe988c..d16b5e92945 100644 --- a/ace/Free_List.h +++ b/ace/Free_List.h @@ -98,14 +98,14 @@ public: /// Returns the current size of the free list. virtual size_t size (void); - /// Resizes the free list to <newsize>. + /// Resizes the free list to @a newsize. virtual void resize (size_t newsize); protected: - /// Allocates <n> extra nodes for the freelist. + /// Allocates @a n extra nodes for the freelist. virtual void alloc (size_t n); - /// Removes and frees <n> nodes from the freelist. + /// Removes and frees @a n nodes from the freelist. virtual void dealloc (size_t n); /// Free list operation mode, either ACE_FREE_LIST_WITH_POOL or @@ -127,7 +127,7 @@ protected: /// Keeps track of the size of the list. size_t size_; - /// Synchronization variable for <ACE_Timer_Queue>. + /// Synchronization variable for ACE_Timer_Queue. ACE_LOCK mutex_; private: diff --git a/ace/Future.h b/ace/Future.h index e4956f13c3b..607ac6e8d75 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -124,7 +124,7 @@ private: /** * Attaches the specified observer to a subject (i.e., the <ACE_Future_Rep>). * The update method of the specified subject will be invoked with a copy of - * the written-to <ACE_Future> as input when the result gets set. + * the written-to ACE_Future as input when the result gets set. * * Returns 0 if the observer is successfully attached, 1 if the * observer is already attached, and -1 if failures occur. diff --git a/ace/Future_Set.h b/ace/Future_Set.h index a601099b1a9..b51d1958c8b 100644 --- a/ace/Future_Set.h +++ b/ace/Future_Set.h @@ -76,17 +76,17 @@ public: /** * Wait up to <tv> time to get the <value>. Note that <tv> must be * specified in absolute time rather than relative time.); get the - * next <ACE_Future> that is readable. If <tv> = 0, the will block + * next ACE_Future that is readable. If <tv> = 0, the will block * forever. * * If a readable future becomes available, then the input - * <ACE_Future> object param will be assigned with it and 1 will - * be returned. If the <ACE_Future_Set> is empty (i.e. see definition - * of <ACE_Future_Set::is_empty>), then 0 is returned. + * ACE_Future object param will be assigned with it and 1 will + * be returned. If the ACE_Future_Set is empty (i.e. see definition + * of ACE_Future_Set::is_empty()), then 0 is returned. * - * When a readable <ACE_Future> object is retrieved via the - * <ACE_Future_Set::next_readable> method, the <ACE_Future_Set> will - * remove that <ACE_Future> object from its list of subjects. + * When a readable ACE_Future object is retrieved via the + * ACE_Future_Set::next_readable() method, the ACE_Future_Set will + * remove that ACE_Future object from its list of subjects. */ int next_readable (ACE_Future<T> &result, ACE_Time_Value *tv = 0); diff --git a/ace/Guard_T.h b/ace/Guard_T.h index 763481da534..d7eedef2715 100644 --- a/ace/Guard_T.h +++ b/ace/Guard_T.h @@ -47,7 +47,7 @@ public: ACE_Guard (ACE_LOCK &l); /// Implicitly and automatically acquire (or try to acquire) the - /// lock. If <block> is non-0 then <acquire> the <ACE_LOCK>, else + /// lock. If @a block is non-0 then <acquire> the <ACE_LOCK>, else /// <tryacquire> it. ACE_Guard (ACE_LOCK &l, int block); @@ -110,7 +110,7 @@ private: /** * @class ACE_Write_Guard * - * @brief This class is similar to class <ACE_Guard>, though it + * @brief This class is similar to class ACE_Guard, though it * acquires/releases a write lock automatically (naturally, the * <ACE_LOCK> it is instantiated with must support the appropriate * API). @@ -154,7 +154,7 @@ public: /** * @class ACE_Read_Guard * - * @brief This class is similar to class <ACE_Guard>, though it + * @brief This class is similar to class ACE_Guard, though it * acquires/releases a read lock automatically (naturally, the * <ACE_LOCK> it is instantiated with must support the appropriate * API). diff --git a/ace/Handle_Gobbler.h b/ace/Handle_Gobbler.h index 0640b113666..36c16b56ed7 100644 --- a/ace/Handle_Gobbler.h +++ b/ace/Handle_Gobbler.h @@ -47,7 +47,7 @@ public: */ inline int consume_handles (size_t n_handles_to_keep_available); - /// Free up <n_handles>. + /// Free up @a n_handles. inline int free_handles (size_t n_handles); /// All remaining handles are closed. diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h index 0b8af83e621..f82873b35c8 100644 --- a/ace/Handle_Set.h +++ b/ace/Handle_Set.h @@ -173,7 +173,7 @@ private: /** * @class ACE_Handle_Set_Iterator * - * @brief Iterator for the <ACE_Handle_Set> abstraction. + * @brief Iterator for the ACE_Handle_Set abstraction. */ class ACE_Export ACE_Handle_Set_Iterator { @@ -189,7 +189,7 @@ public: void reset_state (void); /** - * "Next" operator. Returns the next unseen <ACE_HANDLE> in the + * "Next" operator. Returns the next unseen ACE_HANDLE in the * <Handle_Set> up to <handle_set_.max_handle_>). When all the * handles have been seen returns <ACE_INVALID_HANDLE>. Advances * the iterator automatically, so you need not call <operator++> diff --git a/ace/Hash_Map_Manager_T.h b/ace/Hash_Map_Manager_T.h index 4609d8e141e..34533e1d311 100644 --- a/ace/Hash_Map_Manager_T.h +++ b/ace/Hash_Map_Manager_T.h @@ -619,7 +619,7 @@ protected: * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> @@ -665,7 +665,7 @@ public: * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> @@ -713,7 +713,7 @@ public: * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s * internal lock, which is accessible via its <mutex> method. * * Note that a creation method for this new iterator cannot be added @@ -784,7 +784,7 @@ protected: * <ACE_Hash_Map_Manager_Ex> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Hash_Map_Manager_Ex>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Hash_Map_Manager_Ex>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> diff --git a/ace/Hash_Map_With_Allocator_T.h b/ace/Hash_Map_With_Allocator_T.h index 788d8f12047..088956b48a1 100644 --- a/ace/Hash_Map_With_Allocator_T.h +++ b/ace/Hash_Map_With_Allocator_T.h @@ -56,9 +56,9 @@ public: ACE_Allocator *alloc); // = The following methods are Proxies to the corresponding methods - // in <ACE_Hash_Map_Manager>. Each method sets the allocator to + // in ACE_Hash_Map_Manager. Each method sets the allocator to // the one specified by the invoking entity, and then calls the - // corresponding method in <ACE_Hash_Map_Manager> to do the + // corresponding method in ACE_Hash_Map_Manager to do the // actual work. int bind (const EXT_ID &, @@ -82,8 +82,8 @@ public: INT_ID &, ACE_Allocator *alloc); - /// Returns 0 if the <ext_id> is in the mapping, otherwise -1. - int find (const EXT_ID &, + /// Returns 0 if the @a ext_id is in the mapping, otherwise -1. + int find (const EXT_ID &ext_id, ACE_Allocator *alloc); int close (ACE_Allocator *alloc); diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index ece23337d27..c4e682fe10e 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -322,7 +322,7 @@ ACE_INET_Addr::set (u_short port_number, encode); else { -# if defined (ACE_VXWORKS) || defined (CHORUS) +# if (defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)) || defined (CHORUS) hostent *hp = ACE_OS::gethostbyname (host_name); # else hostent hentry; @@ -782,7 +782,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const } else { -#if defined (ACE_VXWORKS) +#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR) ACE_UNUSED_ARG (len); int error = ::hostGetByAddr ((int) this->inet_addr_.in4_.sin_addr.s_addr, diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp index 9b2e432eb0f..dfca822630b 100644 --- a/ace/Local_Name_Space.cpp +++ b/ace/Local_Name_Space.cpp @@ -132,6 +132,8 @@ ACE_NS_String::hash (void) const } ACE_NS_Internal::ACE_NS_Internal (void) + : value_ (), + type_ () { } diff --git a/ace/Local_Tokens.h b/ace/Local_Tokens.h index 4ed2c1222a0..1351f73f49f 100644 --- a/ace/Local_Tokens.h +++ b/ace/Local_Tokens.h @@ -358,15 +358,15 @@ protected: * Not a public interface. * Currently, I don't see a reason for providing an abstract * interface at this level of the library. As of yet, no one - * uses <ACE_Tokens> derivatives through this abstract interface - * except for <ACE_Token_Manager>. It only uses the statistical + * uses ACE_Tokens derivatives through this abstract interface + * except for ACE_Token_Manager. It only uses the statistical * methods which are shared by all Tokens. For that reason, it * still makes since to have a common base class. However, * acquire, renew, and release do not need to have matching * interfaces throughout all Tokens. * To add a new type of token (e.g. semaphore), this class must * be subtyped to define the new semantics. See - * <ACE_Token_Manager> for details. + * ACE_Token_Manager for details. */ class ACE_Export ACE_Tokens { diff --git a/ace/MEM_IO.h b/ace/MEM_IO.h index 9fda4512af3..595caf0ff6f 100644 --- a/ace/MEM_IO.h +++ b/ace/MEM_IO.h @@ -52,7 +52,7 @@ public: /** * Fetch location of next available data into <recv_buffer_>. * As this operation read the address of the data off the socket - * using ACE::recv, <timeout> only applies to ACE::recv. + * using ACE::recv, @a timeout only applies to ACE::recv. */ virtual ssize_t recv_buf (ACE_MEM_SAP_Node *&buf, int flags, diff --git a/ace/MEM_SAP.h b/ace/MEM_SAP.h index 05704655567..e33c6b77104 100644 --- a/ace/MEM_SAP.h +++ b/ace/MEM_SAP.h @@ -39,7 +39,7 @@ class ACE_MEM_IO; // Internal data structure // MEM_SAP uses to queue up // data. -class ACE_Export ACE_MEM_SAP_Node +class ACE_MEM_SAP_Node { public: // friend class ACE_MEM_SAP; @@ -103,7 +103,7 @@ public: /** * Fetch location of next available data into <recv_buffer_>. * As this operation read the address of the data off the socket - * using ACE::recv, <timeout> only applies to ACE::recv. + * using ACE::recv, @a timeout only applies to ACE::recv. */ virtual ssize_t recv_buf (ACE_MEM_SAP_Node *&buf, int flags, diff --git a/ace/MEM_Stream.h b/ace/MEM_Stream.h index 1a8e4325116..6b4ff4cdd41 100644 --- a/ace/MEM_Stream.h +++ b/ace/MEM_Stream.h @@ -37,9 +37,9 @@ class ACE_MEM_Connector; /** * @class ACE_MEM_Stream * - * @brief Defines the methods in the <ACE_MEM_Stream> abstraction. + * @brief Defines the methods in the ACE_MEM_Stream abstraction. * - * This adds additional wrapper methods atop the <ACE_MEM_IO> + * This adds additional wrapper methods atop the ACE_MEM_IO * class. Notice that ACE_MEM_Stream can only send messages no bigger * than the underlying MMAP file size minus sizeof (ACE_MEM_SAP_Node). * The size of the MMAP file is default to ACE_MEM_STREAM_MIN_BUFFER. @@ -61,7 +61,7 @@ public: /// Constructor. ACE_MEM_Stream (void); - /// Constructor (sets the underlying <ACE_HANDLE> with <h>). + /// Constructor (sets the underlying ACE_HANDLE with <h>). ACE_MEM_Stream (ACE_HANDLE h); /// Destructor. diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h index fa3b3d9f53c..e4f52edc099 100644 --- a/ace/Map_Manager.h +++ b/ace/Map_Manager.h @@ -567,7 +567,7 @@ protected: * <ACE_Map_Manager> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> @@ -614,7 +614,7 @@ public: * <ACE_Map_Manager> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> @@ -661,7 +661,7 @@ public: * <ACE_Map_Manager> it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * <ACE_Guard> or <ACE_Read_Guard> on the <ACE_Map_Manager>'s + * ACE_Guard or ACE_Read_Guard on the <ACE_Map_Manager>'s * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> diff --git a/ace/Message_Block.h b/ace/Message_Block.h index ad159f7c5dc..0d2bada670f 100644 --- a/ace/Message_Block.h +++ b/ace/Message_Block.h @@ -526,7 +526,7 @@ public: // = <ACE_Data_Block> methods. /** - * Get a pointer to the data block. Note that the <ACE_Message_Block> + * Get a pointer to the data block. Note that the ACE_Message_Block * still references the block; this call does not change the reference * count. */ @@ -535,7 +535,7 @@ public: /** * Set a new data block pointer. The original <ACE_Data_Block> is released * as a result of this call. If you need to keep the original block, call - * <replace_data_block> instead. Upon return, this <ACE_Message_Block> + * <replace_data_block> instead. Upon return, this ACE_Message_Block * holds a pointer to the new <ACE_Data_Block>, taking over the reference * you held on it prior to the call. */ @@ -552,14 +552,14 @@ public: /// Set the continuation field. void cont (ACE_Message_Block *); - // = Pointer to the <Message_Block> directly ahead in the <ACE_Message_Queue>. + // = Pointer to the <Message_Block> directly ahead in the ACE_Message_Queue. /// Get link to next message. ACE_Message_Block *next (void) const; /// Set link to next message. void next (ACE_Message_Block *); - // = Pointer to the <Message_Block> directly behind in the <ACE_Message_Queue>. + // = Pointer to the <Message_Block> directly behind in the ACE_Message_Queue. /// Get link to prev message. ACE_Message_Block *prev (void) const; @@ -842,7 +842,7 @@ protected: * Reference count for this <ACE_Data_Block>, which is used to avoid * deep copies (i.e., <clone>). Note that this pointer value is * shared by all owners of the <Data_Block>'s data, i.e., all the - * <ACE_Message_Block>s. + * ACE_Message_Blocks. */ int reference_count_; diff --git a/ace/Message_Queue.cpp b/ace/Message_Queue.cpp index 1a01ff2e202..5479f233b05 100644 --- a/ace/Message_Queue.cpp +++ b/ace/Message_Queue.cpp @@ -432,11 +432,7 @@ ACE_Message_Queue_NT::enqueue (ACE_Message_Block *new_item, size_t mlength = new_item->total_length (); // Note - we send ACTIVATED in the 3rd arg to tell the completion // routine it's _NOT_ being woken up because of deactivate(). -#if defined (ACE_WIN64) ULONG_PTR state_to_post; -#else - DWORD state_to_post; -#endif /* ACE_WIN64 */ state_to_post = ACE_Message_Queue_Base::ACTIVATED; if (::PostQueuedCompletionStatus (this->completion_port_, static_cast<DWORD> (msize), @@ -475,11 +471,7 @@ ACE_Message_Queue_NT::dequeue (ACE_Message_Block *&first_item, ++this->cur_thrs_; // Increase the waiting thread count. } -#if defined (ACE_WIN64) ULONG_PTR queue_state; -#else - DWORD queue_state; -#endif /* ACE_WIN64 */ DWORD msize; // Get a message from the completion port. int retv = ::GetQueuedCompletionStatus (this->completion_port_, diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index bdb30f198ba..e33563bc4a8 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -32,7 +32,7 @@ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Reverse_Iterator; /** * @class ACE_Message_Queue_Base * - * @brief Base class for <ACE_Message_Queue>, which is the central + * @brief Base class for ACE_Message_Queue, which is the central * queueing facility for messages in the ACE framework. * * For all the <ACE_Time_Value> pointer parameters the caller will @@ -90,7 +90,7 @@ public: // = Enqueue and dequeue methods. /** - * Retrieve the first <ACE_Message_Block> without removing it. Note + * Retrieve the first ACE_Message_Block without removing it. Note * that <timeout> uses <{absolute}> time rather than <{relative}> * time. If the <timeout> elapses without receiving a message -1 is * returned and <errno> is set to <EWOULDBLOCK>. If the queue is @@ -259,7 +259,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * <peek_dequeue_head>. * * <ACE_Message_Queue_Iterators>. * * The ability to change low and high water marks after creation. - * * <Message_Block> chains. The continuation field of <ACE_Message_Block> + * * <Message_Block> chains. The continuation field of ACE_Message_Block * * is ignored; only the first block of a fragment chain is * * recognized. */ @@ -433,8 +433,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @note *Many* ACE_Message_Queue features are not supported with * this implementation, including: * * <open> method have different signatures. - * * <dequeue_head> *requires* that the <ACE_Message_Block> - * pointer argument point to an <ACE_Message_Block> that was + * * <dequeue_head> *requires* that the ACE_Message_Block + * pointer argument point to an ACE_Message_Block that was * allocated by the caller. * * <peek_dequeue_head>. * * <ACE_Message_Queue_Iterators>. diff --git a/ace/Message_Queue_T.h b/ace/Message_Queue_T.h index c77ecaffceb..46ef61c79c7 100644 --- a/ace/Message_Queue_T.h +++ b/ace/Message_Queue_T.h @@ -397,7 +397,7 @@ public: /** * Set the low watermark, which determines how many bytes must be in * the queue before supplier threads are allowed to enqueue - * additional <ACE_Message_Block>s. + * additional ACE_Message_Blocks. */ virtual void low_water_mark (size_t lwm); //@} @@ -466,7 +466,7 @@ public: virtual void notification_strategy (ACE_Notification_Strategy *s); //@} - /// Returns a reference to the lock used by the <ACE_Message_Queue>. + /// Returns a reference to the lock used by the ACE_Message_Queue. virtual ACE_SYNCH_MUTEX_T &lock (void); /// Dump the state of an object. @@ -480,7 +480,7 @@ protected: // These routines assume that locks are held by the corresponding // public methods. Since they are virtual, you can change the - // queueing mechanism by subclassing from <ACE_Message_Queue>. + // queueing mechanism by subclassing from ACE_Message_Queue. /// Enqueue an <ACE_Message_Block *> in accordance with its priority. virtual int enqueue_i (ACE_Message_Block *new_item); @@ -605,7 +605,7 @@ typedef ACE_Message_Queue<ACE_SYNCH> ACE_DEFAULT_MESSAGE_QUEUE_TYPE; /** * @class ACE_Message_Queue_Iterator * - * @brief Iterator for the <ACE_Message_Queue>. + * @brief Iterator for the ACE_Message_Queue. */ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Iterator @@ -643,7 +643,7 @@ private: /** * @class ACE_Message_Queue_Reverse_Iterator * - * @brief Reverse Iterator for the <ACE_Message_Queue>. + * @brief Reverse Iterator for the ACE_Message_Queue. */ template <ACE_SYNCH_DECL> class ACE_Message_Queue_Reverse_Iterator @@ -681,7 +681,7 @@ private: /** * @class ACE_Dynamic_Message_Queue * - * @brief A derived class which adapts the <ACE_Message_Queue> + * @brief A derived class which adapts the ACE_Message_Queue * class in order to maintain dynamic priorities for enqueued * <ACE_Message_Blocks> and manage the queue order according * to these dynamic priorities. @@ -949,7 +949,7 @@ public: * queueing facilities in System V STREAMs. * * An <ACE_Message_Queue_Ex> is a strongly-typed version of the - * <ACE_Message_Queue>. If + * ACE_Message_Queue. If * <ACE_SYNCH_DECL> is <ACE_MT_SYNCH> then all operations are * thread-safe. Otherwise, if it's <ACE_NULL_SYNCH> then there's no * locking overhead. @@ -981,12 +981,12 @@ public: // = Initialization and termination methods. /** - * Initialize an <ACE_Message_Queue>. The <high_water_mark> + * Initialize an ACE_Message_Queue. The <high_water_mark> * determines how many bytes can be stored in a queue before it's * considered "full." Supplier threads must block until the queue * is no longer full. The <low_water_mark> determines how many * bytes must be in the queue before supplier threads are allowed to - * enqueue additional <ACE_Message_Block>s. By default, the + * enqueue additional ACE_Message_Blocks. By default, the * <high_water_mark> equals the <low_water_mark>, which means that * suppliers will be able to enqueue new messages as soon as a * consumer removes any message from the queue. Making the @@ -1000,12 +1000,12 @@ public: ACE_Notification_Strategy * = 0); /** - * Initialize an <ACE_Message_Queue>. The <high_water_mark> + * Initialize an ACE_Message_Queue. The <high_water_mark> * determines how many bytes can be stored in a queue before it's * considered "full." Supplier threads must block until the queue * is no longer full. The <low_water_mark> determines how many * bytes must be in the queue before supplier threads are allowed to - * enqueue additional <ACE_Message_Block>s. By default, the + * enqueue additional ACE_Message_Blocks. By default, the * <high_water_mark> equals the <low_water_mark>, which means that * suppliers will be able to enqueue new messages as soon as a * consumer removes any message from the queue. Making the @@ -1029,9 +1029,10 @@ public: /// messages flushed. virtual int flush (void); - /// Release all resources from the message queue but do not mark it as deactivated. - /// This method does not hold the queue lock during this operation, i.e., it assume - /// the lock is held externally. Returns the number of messages flushed. + /// Release all resources from the message queue but do not mark it as + /// deactivated. This method does not hold the queue lock during this + /// operation, i.e., it assume the lock is held externally. + /// Returns the number of messages flushed. virtual int flush_i (void); // = Enqueue and dequeue methods. @@ -1292,7 +1293,7 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Implement this via an <ACE_Message_Queue>. + /// Implement this via an ACE_Message_Queue. ACE_Message_Queue<ACE_SYNCH_USE> queue_; }; diff --git a/ace/Msg_WFMO_Reactor.h b/ace/Msg_WFMO_Reactor.h index 633d91562cb..d86258bb690 100644 --- a/ace/Msg_WFMO_Reactor.h +++ b/ace/Msg_WFMO_Reactor.h @@ -76,7 +76,7 @@ public: * * <MsgWaitForMultipleObjects> is used as the demultiplexing call * - * Returns the total number of <ACE_Event_Handler>s that were + * Returns the total number of ACE_Event_Handlers that were * dispatched, 0 if the <max_wait_time> elapsed without dispatching * any handlers, or -1 if an error occurs. * diff --git a/ace/Name_Space.cpp b/ace/Name_Space.cpp index 4a5d7e9d71a..2f15a9e71d3 100644 --- a/ace/Name_Space.cpp +++ b/ace/Name_Space.cpp @@ -10,7 +10,9 @@ ACE_RCSID(ace, Name_Space, "$Id$") ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Name_Binding::ACE_Name_Binding (void) - : type_ (ACE_OS::strdup ("")) + : name_ (), + value_ (), + type_ (ACE_OS::strdup ("")) { ACE_TRACE ("ACE_Name_Binding::ACE_Name_Binding"); } diff --git a/ace/Node.h b/ace/Node.h index 941f5d1c686..6ec514d8141 100644 --- a/ace/Node.h +++ b/ace/Node.h @@ -61,7 +61,11 @@ private: ACE_Node (const T &i, ACE_Node<T> *n); ACE_Node (ACE_Node<T> *n = 0, int = 0); ACE_Node (const ACE_Node<T> &n); +private: + /// Not possible + void operator= (const ACE_Node<T> &); +private: /// Pointer to next element in the list of <ACE_Node>s. ACE_Node<T> *next_; diff --git a/ace/Null_Condition.h b/ace/Null_Condition.h index 8889d7632a3..a72df210a51 100644 --- a/ace/Null_Condition.h +++ b/ace/Null_Condition.h @@ -33,7 +33,7 @@ class ACE_Time_Value; /** * @class ACE_Null_Condition * - * @brief Implement a do nothing <ACE_Condition> variable wrapper, + * @brief Implement a do nothing ACE_Condition variable wrapper, * i.e., all methods are no ops. This class is necessary since * some C++ compilers are *very* lame... */ diff --git a/ace/Null_Mutex.h b/ace/Null_Mutex.h index 8786b831280..022cc034df6 100644 --- a/ace/Null_Mutex.h +++ b/ace/Null_Mutex.h @@ -122,8 +122,8 @@ class ACE_Guard; /** * @class ACE_Guard<ACE_Null_Mutex> * - * @brief Template specialization of <ACE_Guard> for the - * <ACE_Null_Mutex>. + * @brief Template specialization of ACE_Guard for the + * ACE_Null_Mutex. * * This specialization is useful since it helps to speedup * performance of the "Null_Mutex" considerably. diff --git a/ace/Null_Semaphore.h b/ace/Null_Semaphore.h index 5921d90a7b3..9124f46cf73 100644 --- a/ace/Null_Semaphore.h +++ b/ace/Null_Semaphore.h @@ -31,7 +31,7 @@ class ACE_Time_Value; /** * @class ACE_Null_Semaphore * - * @brief Implement a do nothing <ACE_Semaphore>, i.e., all the methods are + * @brief Implement a do nothing ACE_Semaphore, i.e., all the methods are * no ops. * * Although the methods are no-ops, the return values are different for diff --git a/ace/OS_NS_Thread.inl b/ace/OS_NS_Thread.inl index 2970be63bad..c5f3b660a51 100644 --- a/ace/OS_NS_Thread.inl +++ b/ace/OS_NS_Thread.inl @@ -85,7 +85,7 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key) t_getreg (0, PSOS_TASK_REG_TSS, &tss_base); return ((void **) tss_base)[key_index]; # else -# if defined (VXWORKS) +# if defined (ACE_VXWORKS) /* If someone wants tss_base make sure they get one. This gets used if someone spawns a VxWorks task directly, not through ACE. The allocated array will never be deleted! */ diff --git a/ace/OS_NS_dirent.cpp b/ace/OS_NS_dirent.cpp index fe09a9448cd..9b58d284683 100644 --- a/ace/OS_NS_dirent.cpp +++ b/ace/OS_NS_dirent.cpp @@ -122,7 +122,7 @@ ACE_OS::opendir_emulation (const ACE_TCHAR *filename) #endif /* WIN32 && ACE_LACKS_OPENDIR */ } -dirent * +struct ACE_DIRENT * ACE_OS::readdir_emulation (ACE_DIR *d) { #if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR) @@ -153,8 +153,8 @@ ACE_OS::readdir_emulation (ACE_DIR *d) if (d->current_handle_ != INVALID_HANDLE_VALUE) { - d->dirent_ = (dirent *) - ACE_OS::malloc (sizeof (dirent)); + d->dirent_ = (ACE_DIRENT *) + ACE_OS::malloc (sizeof (ACE_DIRENT)); if (d->dirent_ != 0) { @@ -162,7 +162,7 @@ ACE_OS::readdir_emulation (ACE_DIR *d) ACE_OS::malloc ((ACE_OS::strlen (d->fdata_.cFileName) + 1) * sizeof (ACE_TCHAR)); ACE_OS::strcpy (d->dirent_->d_name, d->fdata_.cFileName); - d->dirent_->d_reclen = sizeof (dirent); + d->dirent_->d_reclen = sizeof (ACE_DIRENT); } return d->dirent_; @@ -177,10 +177,10 @@ ACE_OS::readdir_emulation (ACE_DIR *d) int ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, - dirent **namelist[], - int (*selector) (const dirent *entry), - int (*comparator) (const dirent **f1, - const dirent **f2)) + ACE_DIRENT **namelist[], + int (*selector) (const ACE_DIRENT *entry), + int (*comparator) (const ACE_DIRENT **f1, + const ACE_DIRENT **f2)) { ACE_DIR *dirp = ACE_OS::opendir (dirname); @@ -190,8 +190,8 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, else if (namelist == 0) return -1; - dirent **vector = 0; - dirent *dp; + ACE_DIRENT **vector = 0; + ACE_DIRENT *dp = 0; int arena_size = 0; int nfiles = 0; @@ -208,14 +208,14 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, // If we get here, we have a dirent that the user likes. if (nfiles == arena_size) { - dirent **newv; + ACE_DIRENT **newv = 0; if (arena_size == 0) arena_size = 10; else arena_size *= 2; - newv = (dirent **) ACE_OS::realloc (vector, - arena_size * sizeof (dirent *)); + newv = (ACE_DIRENT **) ACE_OS::realloc (vector, + arena_size * sizeof (ACE_DIRENT *)); if (newv == 0) { fail = 1; @@ -225,12 +225,12 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, } #if defined (ACE_LACKS_STRUCT_DIR) - dirent *newdp = (dirent *) ACE_OS::malloc (sizeof (dirent)); + ACE_DIRENT *newdp = (ACE_DIRENT *) ACE_OS::malloc (sizeof (ACE_DIRENT)); #else size_t dsize = - sizeof (dirent) + + sizeof (ACE_DIRENT) + ((ACE_OS::strlen (dp->d_name) + 1) * sizeof (ACE_TCHAR)); - dirent *newdp = (dirent *) ACE_OS::malloc (dsize); + ACE_DIRENT *newdp = (ACE_DIRENT *) ACE_OS::malloc (dsize); #endif /* ACE_LACKS_STRUCT_DIR */ if (newdp == 0) @@ -257,7 +257,7 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, ACE_OS::strcpy (newdp->d_name, dp->d_name); vector[nfiles++] = newdp; #else - vector[nfiles++] = (dirent *) ACE_OS::memcpy (newdp, dp, dsize); + vector[nfiles++] = (ACE_DIRENT *) ACE_OS::memcpy (newdp, dp, dsize); #endif /* ACE_LACKS_STRUCT_DIR */ } @@ -282,7 +282,7 @@ ACE_OS::scandir_emulation (const ACE_TCHAR *dirname, if (comparator) ACE_OS::qsort (*namelist, nfiles, - sizeof (dirent *), + sizeof (ACE_DIRENT *), (ACE_SCANDIR_COMPARATOR) comparator); return nfiles; diff --git a/ace/OS_NS_dirent.h b/ace/OS_NS_dirent.h index f394c941a90..6def1696ac0 100644 --- a/ace/OS_NS_dirent.h +++ b/ace/OS_NS_dirent.h @@ -44,22 +44,22 @@ namespace ACE_OS { ACE_DIR *opendir (const ACE_TCHAR *filename); ACE_NAMESPACE_INLINE_FUNCTION - dirent *readdir (ACE_DIR *); + struct ACE_DIRENT *readdir (ACE_DIR *); ACE_NAMESPACE_INLINE_FUNCTION int readdir_r (ACE_DIR *dirp, - struct dirent *entry, - struct dirent **result); + struct ACE_DIRENT *entry, + struct ACE_DIRENT **result); ACE_NAMESPACE_INLINE_FUNCTION void rewinddir (ACE_DIR *); ACE_NAMESPACE_INLINE_FUNCTION int scandir (const ACE_TCHAR *dirname, - struct dirent **namelist[], - int (*selector) (const struct dirent *filename), - int (*comparator) (const struct dirent **f1, - const struct dirent **f2)); + struct ACE_DIRENT **namelist[], + int (*selector) (const struct ACE_DIRENT *filename), + int (*comparator) (const struct ACE_DIRENT **f1, + const struct ACE_DIRENT **f2)); ACE_NAMESPACE_INLINE_FUNCTION void seekdir (ACE_DIR *, @@ -74,16 +74,16 @@ namespace ACE_OS { extern ACE_Export int scandir_emulation (const ACE_TCHAR *dirname, - dirent **namelist[], - int (*selector)(const dirent *entry), - int (*comparator)(const dirent **f1, - const dirent**f2)); + ACE_DIRENT **namelist[], + int (*selector)(const ACE_DIRENT *entry), + int (*comparator)(const ACE_DIRENT **f1, + const ACE_DIRENT**f2)); extern ACE_Export void closedir_emulation (ACE_DIR *); extern ACE_Export - dirent *readdir_emulation (ACE_DIR *); + struct ACE_DIRENT *readdir_emulation (ACE_DIR *); } /* namespace ACE_OS */ diff --git a/ace/OS_NS_dirent.inl b/ace/OS_NS_dirent.inl index 3083f65a5be..ff562717cb9 100644 --- a/ace/OS_NS_dirent.inl +++ b/ace/OS_NS_dirent.inl @@ -6,8 +6,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL +namespace ACE_OS +{ + ACE_INLINE void -ACE_OS::closedir (ACE_DIR *d) +closedir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) @@ -23,6 +26,8 @@ ACE_OS::closedir (ACE_DIR *d) ACE_OS::closedir_emulation (d); delete [] d->directory_name_; delete d; +# elif defined (ACE_HAS_WCLOSEDIR) && defined (ACE_USES_WCHAR) + ::wclosedir (d); # else /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */ ::closedir (d); # endif /* ACE_WIN32 && ACE_LACKS_CLOSEDIR */ @@ -34,13 +39,13 @@ ACE_OS::closedir (ACE_DIR *d) } ACE_INLINE ACE_DIR * -ACE_OS::opendir (const ACE_TCHAR *filename) +opendir (const ACE_TCHAR *filename) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) // The pointer to the <ACE_DIR> buffer *must* be passed to // <ACE_OS::closedir> to free it and avoid a memory leak. - ACE_DIR *dir; + ACE_DIR *dir = 0; u_long result; ACE_NEW_RETURN (dir, ACE_DIR, 0); result = ::open_dir (const_cast<ACE_TCHAR *> (filename), &dir->xdir); @@ -54,6 +59,8 @@ ACE_OS::opendir (const ACE_TCHAR *filename) # else /* ! ACE_PSOS */ # if defined (ACE_WIN32) && defined (ACE_LACKS_OPENDIR) return ::ACE_OS::opendir_emulation (filename); +# elif defined (ACE_HAS_WOPENDIR) && defined (ACE_USES_WCHAR) + return ::wopendir (filename); # elif defined (ACE_HAS_NONCONST_OPENDIR) return ::opendir (const_cast<char *> (filename)); # else /* ! ACE_WIN32 && ACE_LACKS_OPENDIR */ @@ -66,8 +73,9 @@ ACE_OS::opendir (const ACE_TCHAR *filename) #endif /* ACE_HAS_DIRENT */ } -ACE_INLINE struct dirent * -ACE_OS::readdir (ACE_DIR *d) +ACE_INLINE +struct ACE_DIRENT * +readdir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_PSOS) @@ -84,6 +92,8 @@ ACE_OS::readdir (ACE_DIR *d) # else /* ! ACE_PSOS */ # if defined (ACE_WIN32) && defined (ACE_LACKS_READDIR) return ACE_OS::readdir_emulation (d); +# elif defined (ACE_HAS_WREADDIR) && defined (ACE_USES_WCHAR) + return ::wreaddir (d); # else /* ACE_WIN32 && ACE_LACKS_READDIR */ return ::readdir (d); # endif /* ACE_WIN32 && ACE_LACKS_READDIR */ @@ -95,9 +105,9 @@ ACE_OS::readdir (ACE_DIR *d) } ACE_INLINE int -ACE_OS::readdir_r (ACE_DIR *dirp, - struct dirent *entry, - struct dirent **result) +readdir_r (ACE_DIR *dirp, + struct ACE_DIRENT *entry, + struct ACE_DIRENT **result) { #if !defined (ACE_HAS_REENTRANT_FUNCTIONS) ACE_UNUSED_ARG (entry); @@ -143,12 +153,14 @@ ACE_OS::readdir_r (ACE_DIR *dirp, } ACE_INLINE void -ACE_OS::rewinddir (ACE_DIR *d) +rewinddir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) # if defined (ACE_LACKS_SEEKDIR) # if defined (ACE_LACKS_REWINDDIR) ACE_UNUSED_ARG (d); +# elif defined (ACE_HAS_WREWINDDIR) && defined (ACE_USES_WCHAR) + ::wrewinddir (d); # else /* ! defined (ACE_LACKS_REWINDDIR) */ ::rewinddir (d); # endif /* ! defined (ACE_LACKS_REWINDDIR) */ @@ -163,11 +175,11 @@ ACE_OS::rewinddir (ACE_DIR *d) } ACE_INLINE int -ACE_OS::scandir (const ACE_TCHAR *dirname, - struct dirent **namelist[], - int (*selector)(const struct dirent *), - int (*comparator) (const struct dirent **f1, - const struct dirent **f2)) +scandir (const ACE_TCHAR *dirname, + struct ACE_DIRENT **namelist[], + int (*selector)(const struct ACE_DIRENT *), + int (*comparator) (const struct ACE_DIRENT **f1, + const struct ACE_DIRENT **f2)) { #if defined (ACE_HAS_SCANDIR) return ::scandir (ACE_TEXT_ALWAYS_CHAR (dirname), @@ -182,8 +194,9 @@ ACE_OS::scandir (const ACE_TCHAR *dirname, return ACE_OS::scandir_emulation (dirname, namelist, selector, comparator); #endif /* ACE_HAS_SCANDIR */ } + ACE_INLINE void -ACE_OS::seekdir (ACE_DIR *d, long loc) +seekdir (ACE_DIR *d, long loc) { #if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_SEEKDIR) ::seekdir (d, loc); @@ -194,7 +207,7 @@ ACE_OS::seekdir (ACE_DIR *d, long loc) } ACE_INLINE long -ACE_OS::telldir (ACE_DIR *d) +telldir (ACE_DIR *d) { #if defined (ACE_HAS_DIRENT) && !defined (ACE_LACKS_TELLDIR) return ::telldir (d); @@ -204,4 +217,6 @@ ACE_OS::telldir (ACE_DIR *d) #endif /* ! ACE_HAS_DIRENT || ACE_LACKS_TELLDIR */ } +} + ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_stdlib.inl b/ace/OS_NS_stdlib.inl index b7816569850..0762d7443f5 100644 --- a/ace/OS_NS_stdlib.inl +++ b/ace/OS_NS_stdlib.inl @@ -138,9 +138,6 @@ ACE_OS::getenv (const char *symbol) #if defined (ACE_LACKS_ENV) ACE_UNUSED_ARG (symbol); ACE_NOTSUP_RETURN (0); -#elif defined (ACE_PSOS) - ACE_UNUSED_ARG (symbol); - ACE_NOTSUP_RETURN (0); #else /* ACE_PSOS */ ACE_OSCALL_RETURN (::getenv (symbol), char *, 0); #endif /* ACE_LACKS_ENV */ diff --git a/ace/OS_NS_sys_shm.h b/ace/OS_NS_sys_shm.h index d19414b114f..df39efdfd60 100644 --- a/ace/OS_NS_sys_shm.h +++ b/ace/OS_NS_sys_shm.h @@ -41,7 +41,7 @@ namespace ACE_OS //@{ @name A set of wrappers for System V shared memory. ACE_NAMESPACE_INLINE_FUNCTION void *shmat (int int_id, - void *shmaddr, + const void *shmaddr, int shmflg); ACE_NAMESPACE_INLINE_FUNCTION @@ -50,7 +50,7 @@ namespace ACE_OS struct shmid_ds *buf); ACE_NAMESPACE_INLINE_FUNCTION - int shmdt (void *shmaddr); + int shmdt (const void *shmaddr); ACE_NAMESPACE_INLINE_FUNCTION int shmget (key_t key, diff --git a/ace/OS_NS_sys_shm.inl b/ace/OS_NS_sys_shm.inl index 1061765f356..1fe83becd0f 100644 --- a/ace/OS_NS_sys_shm.inl +++ b/ace/OS_NS_sys_shm.inl @@ -7,11 +7,15 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void * -ACE_OS::shmat (int int_id, void *shmaddr, int shmflg) +ACE_OS::shmat (int int_id, const void *shmaddr, int shmflg) { ACE_OS_TRACE ("ACE_OS::shmat"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char *> (shmaddr), shmflg), void *, (void *) -1); +# if defined (ACE_HAS_CHARPTR_SHMAT) + ACE_OSCALL_RETURN (::shmat (int_id, static_cast <char*> (shmaddr), shmflg), void *, (void *) -1); +# else + ACE_OSCALL_RETURN (::shmat (int_id, shmaddr, shmflg), void *, (void *) -1); +# endif /* ACE_HAS_CHARPTR_SHMAT */ #else ACE_UNUSED_ARG (int_id); ACE_UNUSED_ARG (shmaddr); @@ -37,11 +41,15 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf) } ACE_INLINE int -ACE_OS::shmdt (void *shmaddr) +ACE_OS::shmdt (const void *shmaddr) { ACE_OS_TRACE ("ACE_OS::shmdt"); #if defined (ACE_HAS_SYSV_IPC) - ACE_OSCALL_RETURN (::shmdt ((char *) shmaddr), int, -1); +# if defined (ACE_HAS_CHARPTR_SHMDT) + ACE_OSCALL_RETURN (::shmdt (static_cast <char*> (shmaddr)), int, -1); +# else + ACE_OSCALL_RETURN (::shmdt (shmaddr), int, -1); +# endif /* ACE_HAS_CHARPTR_SHMDT */ #else ACE_UNUSED_ARG (shmaddr); diff --git a/ace/OS_NS_sys_utsname.cpp b/ace/OS_NS_sys_utsname.cpp index 114d8a5b9ca..ea4e96c1348 100644 --- a/ace/OS_NS_sys_utsname.cpp +++ b/ace/OS_NS_sys_utsname.cpp @@ -15,24 +15,13 @@ ACE_RCSID(ace, OS_NS_sys_utsname, "$Id$") ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#if !defined (ACE_LACKS_UNAME) int ACE_OS::uname (ACE_utsname *name) { ACE_OS_TRACE ("ACE_OS::uname"); +#if !defined (ACE_LACKS_UNAME) ACE_OSCALL_RETURN (::uname (name), int, -1); -} -#endif /* ! ACE_LACKS_UNAME */ - -#if defined (ACE_LACKS_UNAME) -// Don't inline on those platforms because this function contains -// string literals, and some compilers, e.g., g++, don't handle those -// efficiently in unused inline functions. -int -ACE_OS::uname (ACE_utsname *name) -{ - ACE_OS_TRACE ("ACE_OS::uname"); -# if defined (ACE_WIN32) +#elif defined (ACE_WIN32) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, ACE_LIB_TEXT ("Win32")); @@ -225,7 +214,7 @@ ACE_OS::uname (ACE_utsname *name) return ACE_OS::hostname (name->nodename, maxnamelen); # endif /* ACE_LACKS_HOSTNAME */ -# elif defined (ACE_VXWORKS) +#elif defined (ACE_VXWORKS) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "VxWorks"); ACE_OS::strcpy (name->release, "???"); @@ -233,7 +222,7 @@ ACE_OS::uname (ACE_utsname *name) ACE_OS::strcpy (name->machine, sysModel ()); return ACE_OS::hostname (name->nodename, maxnamelen); -# elif defined (CHORUS) +#elif defined (CHORUS) size_t maxnamelen = sizeof name->nodename; ACE_OS::strcpy (name->sysname, "CHORUS/ClassiX"); ACE_OS::strcpy (name->release, "???"); @@ -263,6 +252,5 @@ ACE_OS::uname (ACE_utsname *name) return status; #endif /* ACE_WIN32 */ } -#endif /* ACE_LACKS_UNAME */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ace/OS_NS_unistd.cpp b/ace/OS_NS_unistd.cpp index c38bf483f48..37b6170c6fc 100644 --- a/ace/OS_NS_unistd.cpp +++ b/ace/OS_NS_unistd.cpp @@ -16,11 +16,7 @@ ACE_RCSID(ace, OS_NS_unistd, "$Id$") #include "ace/OS_NS_Thread.h" #include "ace/Object_Manager_Base.h" #include "ace/os_include/sys/os_pstat.h" - -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -// for sysctl(), used by ACE_OS::num_processors() -#include <sys/sysctl.h> -#endif +#include "ace/os_include/sys/os_sysctl.h" #if defined (ACE_NEEDS_FTRUNCATE) extern "C" int @@ -302,13 +298,13 @@ ACE_OS::num_processors (void) #if defined (ACE_HAS_PHARLAP) return 1; -#elif defined (ACE_WIN32) || defined (ACE_WIN64) +#elif defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; -#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32) +#elif defined (_SC_NPROCESSORS_CONF) return ::sysconf (_SC_NPROCESSORS_CONF); -#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined (ACE_HAS_SYSCTL) int num_processors; int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof (num_processors); @@ -327,11 +323,11 @@ ACE_OS::num_processors_online (void) #if defined (ACE_HAS_PHARLAP) return 1; -#elif defined (ACE_WIN32) || defined (ACE_WIN64) +#elif defined (ACE_WIN32) SYSTEM_INFO sys_info; ::GetSystemInfo (&sys_info); return sys_info.dwNumberOfProcessors; -#elif defined (linux) || defined (sun) || defined (DIGITAL_UNIX) || defined (CYGWIN32) +#elif defined (_SC_NPROCESSORS_ONLN) return ::sysconf (_SC_NPROCESSORS_ONLN); #elif defined (__hpux) struct pst_dynamic psd; @@ -339,7 +335,7 @@ ACE_OS::num_processors_online (void) return psd.psd_proc_cnt; else return -1; -#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) +#elif defined (ACE_HAS_SYSCTL) int num_processors; int mib[2] = { CTL_HW, HW_NCPU }; size_t len = sizeof (num_processors); diff --git a/ace/OS_NS_unistd.inl b/ace/OS_NS_unistd.inl index 81c7dbb269a..b2cf7e3c80b 100644 --- a/ace/OS_NS_unistd.inl +++ b/ace/OS_NS_unistd.inl @@ -879,7 +879,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len) ssize_t result; # if defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL (::read (handle, (char *) buf, len), ssize_t, -1, result); + ACE_OSCALL (::read (handle, static_cast <char *> (buf), len), ssize_t, -1, result); # else ACE_OSCALL (::read (handle, buf, len), ssize_t, -1, result); # endif /* ACE_HAS_CHARPTR_SOCKOPT */ @@ -941,8 +941,6 @@ ACE_OS::readlink (const char *path, char *buf, size_t bufsiz) # endif /* ACE_LACKS_READLINK */ } -#if !defined (ACE_WIN32) - ACE_INLINE int ACE_OS::pipe (ACE_HANDLE fds[]) { @@ -950,28 +948,15 @@ ACE_OS::pipe (ACE_HANDLE fds[]) # if defined (ACE_LACKS_PIPE) ACE_UNUSED_ARG (fds); ACE_NOTSUP_RETURN (-1); -# else - ACE_OSCALL_RETURN (::pipe (fds), int, -1); -# endif /* ACE_LACKS_PIPE */ -} - -#else /* ACE_WIN32 */ - -ACE_INLINE int -ACE_OS::pipe (ACE_HANDLE fds[]) -{ -# if !defined (ACE_HAS_WINCE) && !defined (__IBMCPP__) - ACE_OS_TRACE ("ACE_OS::pipe"); +# elif defined (ACE_WIN32) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CreatePipe (&fds[0], &fds[1], 0, 0), ace_result_), int, -1); # else - ACE_NOTSUP_RETURN (-1); -# endif /* ACE_HAS_WINCE && !__IBMCPP__ */ + ACE_OSCALL_RETURN (::pipe (fds), int, -1); +# endif /* ACE_LACKS_PIPE */ } -#endif /* !ACE_WIN32 */ - ACE_INLINE void * ACE_OS::sbrk (ptrdiff_t brk) { @@ -1337,7 +1322,7 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte) # if defined (ACE_PSOS) ACE_OSCALL_RETURN (::write_f(handle, (void *) buf, nbyte), ssize_t, -1); # elif defined (ACE_HAS_CHARPTR_SOCKOPT) - ACE_OSCALL_RETURN (::write (handle, (char *) buf, nbyte), ssize_t, -1); + ACE_OSCALL_RETURN (::write (handle, static_cast <char *> (buf), nbyte), ssize_t, -1); # else ACE_OSCALL_RETURN (::write (handle, buf, nbyte), ssize_t, -1); # endif /* ACE_PSOS */ diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h index eb96167e617..efa9e9376b7 100644 --- a/ace/Object_Manager.h +++ b/ace/Object_Manager.h @@ -346,7 +346,7 @@ public: // use by ACE_Singleton _only_. /** - * Accesses an <ACE_Null_Mutex> to be used for construction of + * Accesses an ACE_Null_Mutex to be used for construction of * <ACE_Singletons>. Returns 0, and the lock in the argument, on * success; returns -1 on failure. */ @@ -367,7 +367,7 @@ public: static int get_singleton_lock (ACE_Mutex *&); /** - * Accesses a recursive <ACE_Recursive_Thread_Mutex> to be used for + * Accesses a recursive ACE_Recursive_Thread_Mutex to be used for * construction of <ACE_Singletons>. Returns 0, and the lock in the * argument, on success; returns -1 on failure. */ diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index 653a34f3ac1..dbd32d86357 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -358,6 +358,7 @@ ACE_Location_Node::dump (void) const ACE_Location_Node::ACE_Location_Node (void) : pathname_ (0), + dll_ (), symbol_ (0) { ACE_TRACE ("ACE_Location_Node::ACE_Location_Node"); diff --git a/ace/Proactor.h b/ace/Proactor.h index b88d0769a40..ad88b4ee36b 100644 --- a/ace/Proactor.h +++ b/ace/Proactor.h @@ -46,7 +46,7 @@ class ACE_Proactor_Timer_Handler; /** * @class ACE_Proactor_Handle_Timeout_Upcall * - * @brief Functor for <ACE_Timer_Queue>. + * @brief Functor for ACE_Timer_Queue. * * This class implements the functor required by the Timer * Queue to call <handle_timeout> on ACE_Handlers. @@ -240,7 +240,7 @@ public: static int reset_event_loop (void); /** - * The singleton proactor is used by the <ACE_Service_Config>. + * The singleton proactor is used by the ACE_Service_Config. * Therefore, we must check for the reconfiguration request and * handle it after handling an event. */ diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h index c0e97268cb0..847bc694a10 100644 --- a/ace/Proactor_Impl.h +++ b/ace/Proactor_Impl.h @@ -49,13 +49,13 @@ public: /// Close the IO completion port. virtual int close (void) = 0; - /// This method adds the <handle> to the I/O completion port. This + /// This method adds the @a handle to the I/O completion port. This /// function is a no-op function for Unix systems. virtual int register_handle (ACE_HANDLE handle, const void *completion_key) = 0; /** - * Dispatch a single set of events. If <wait_time> elapses before + * Dispatch a single set of events. If @a wait_time elapses before * any events occur, return 0. Return 1 on success i.e., when a * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. @@ -251,7 +251,7 @@ public: int signal_number = 0) = 0; /** - * Post <how_many> completions to the completion port so that all + * Post @a how_many completions to the completion port so that all * threads can wake up. This is used in conjunction with the * <run_event_loop>. */ diff --git a/ace/Process_Manager.h b/ace/Process_Manager.h index 8fa81cfa6b9..22bcd3d4c2c 100644 --- a/ace/Process_Manager.h +++ b/ace/Process_Manager.h @@ -93,8 +93,8 @@ private: * <Process> exits, or when any <Process> without a specific * <Event_Handler> exits. When a <Process> exits, the * appropriate <Event_Handler>'s <handle_input> is called; the - * <ACE_HANDLE> passed is either the Process' HANDLE (on Win32), - * or its pid cast to an <ACE_HANDLE> (on unix). + * ACE_HANDLE passed is either the Process' HANDLE (on Win32), + * or its pid cast to an ACE_HANDLE (on unix). * It is also possible to call the <Process_Manager::wait> * functions even though the <Process_Manager> is registered with * a <Reactor>. @@ -138,7 +138,7 @@ public: * needed. If a non-NULL <reactor> is provided, this * <ACE_Process_Manager> uses it to notify an application when a * process it controls exits. By default, however, we don't use an - * <ACE_Reactor>. + * ACE_Reactor. */ ACE_Process_Manager (size_t size = ACE_Process_Manager::DEFAULT_SIZE, ACE_Reactor *reactor = 0); @@ -149,7 +149,7 @@ public: * needed. If a non-NULL <reactor> is provided, this * <ACE_Process_Manager> uses it to notify an application when a * process it controls exits. By default, however, we don't use an - * <ACE_Reactor>. + * ACE_Reactor. */ int open (size_t size = DEFAULT_SIZE, ACE_Reactor *r = 0); @@ -179,8 +179,8 @@ public: // = Process creation methods. /** - * Create a new process by passing <options> to <proc.spawn>. - * Register <event_handler> to be called back when the process exits. + * Create a new process by passing <options> to <proc.spawn>. + * Register <event_handler> to be called back when the process exits. * * On success, returns the process id of the child that was created. * On failure, returns ACE_INVALID_PID. @@ -190,8 +190,8 @@ public: ACE_Event_Handler *event_handler = 0); /** - * Create a new process by passing <options> to <ACE_Process::spawn>. - * Register <event_handler> to be called back when the process exits. + * Create a new process by passing <options> to <ACE_Process::spawn>. + * Register <event_handler> to be called back when the process exits. * * On success, returns the process id of the child that was created. * On failure, returns ACE_INVALID_PID. @@ -204,7 +204,7 @@ public: * <ACE_Process::spawn>, which is called <n> times. If <child_pids> * is non-0 it is expected to be an array of <n> <pid_t>'s, which * are filled in with the process ids of each newly created process. - * Register <event_handler> to be called back when each process exits. + * Register <event_handler> to be called back when each process exits. * Returns 0 on success and -1 on failure. */ int spawn_n (size_t n, @@ -366,7 +366,7 @@ private: /// Insert a process in the table (checks for duplicates). Omitting /// the process handle won't work on Win32... - /// Register <event_handler> to be called back when the process exits. + /// Register <event_handler> to be called back when the process exits. int insert_proc (ACE_Process *process, ACE_Event_Handler *event_handler = 0); @@ -374,7 +374,7 @@ private: * Append information about a process, i.e., its <process_id> in the * <process_table_>. Each entry is added at the end, growing the * table if necessary. - * Register <event_handler> to be called back when the process exits. + * Register <event_handler> to be called back when the process exits. */ int append_proc (ACE_Process *process, ACE_Event_Handler *event_handler = 0); diff --git a/ace/README b/ace/README index f0febc8544f..b3ee57dd2b7 100644 --- a/ace/README +++ b/ace/README @@ -717,9 +717,6 @@ ACE_HAS_UNION_WAIT The wait() system call takes a ACE_HAS_UNIXWARE_SVR4_SIGNAL_T Has inconsistent SVR4 signal stuff, but not the same as the other platforms -ACE_HAS_USING_KEYWORD Compiler supports the new - using keyword for C++ - namespaces. ACE_HAS_VALGRIND Running with valgrind ACE_HAS_VERBOSE_NOTSUP Prints out console message in ACE_NOTSUP. Useful for diff --git a/ace/Reactor.h b/ace/Reactor.h index 5e2fd54fead..b0402b5e40a 100644 --- a/ace/Reactor.h +++ b/ace/Reactor.h @@ -50,7 +50,7 @@ class ACE_Sig_Set; * * @brief The responsibility of this class is to forward all methods to * its delegation/implementation class, e.g., - * <ACE_Select_Reactor> or <ACE_WFMO_Reactor>. + * ACE_Select_Reactor or ACE_WFMO_Reactor. */ class ACE_Export ACE_Reactor : public ACE_Reactor_Timer_Interface { @@ -80,11 +80,11 @@ public: */ typedef int (*REACTOR_EVENT_HOOK)(ACE_Reactor *); - /// Get pointer to a process-wide <ACE_Reactor>. + /// Get pointer to a process-wide ACE_Reactor. static ACE_Reactor *instance (void); /** - * Set pointer to a process-wide <ACE_Reactor> and return existing + * Set pointer to a process-wide ACE_Reactor and return existing * pointer. If <delete_reactor> != 0 then we'll delete the Reactor * at destruction time. */ @@ -164,7 +164,7 @@ public: static void reset_event_loop (void); /** - * The singleton reactor is used by the <ACE_Service_Config>. + * The singleton reactor is used by the ACE_Service_Config. * Therefore, we must check for the reconfiguration request and * handle it after handling an event. */ @@ -228,8 +228,8 @@ public: virtual ~ACE_Reactor (void); /** - * Initialize the <ACE_Reactor> to manage <max_number_of_handles>. - * If <restart> is non-0 then the <ACE_Reactor>'s <handle_events> + * Initialize the ACE_Reactor to manage <max_number_of_handles>. + * If <restart> is non-0 then the ACE_Reactor's <handle_events> * method will be restarted automatically when <EINTR> occurs. If * <signal_handler> or <timer_queue> are non-0 they are used as the * signal handler and timer queue, respectively. @@ -273,7 +273,7 @@ public: * application wishes to handle events for some fixed amount of * time. * - * Returns the total number of timers and I/O <ACE_Event_Handler>s + * Returns the total number of timers and I/O ACE_Event_Handlers * that were dispatched, 0 if the <max_wait_time> elapsed without * dispatching any handlers, or -1 if an error occurs. * @@ -384,12 +384,12 @@ public: /** * Register handler for signals. * - * Register <new_sh> to handle the signal <signum> using the - * <new_disp>. Returns the <old_sh> that was previously registered - * (if any), along with the <old_disp> of the signal handler. + * Register @a new_sh to handle the signal @a signum using the + * @a new_disp. Returns the @a old_sh that was previously registered + * (if any), along with the @a old_disp of the signal handler. * - * Reactor will call ACE_Event_Handler::add_reference() on <new_sh> - * and ACE_Event_Handler::remove_reference() on <old_sh>. + * Reactor will call ACE_Event_Handler::add_reference() on @a new_sh + * and ACE_Event_Handler::remove_reference() on @a old_sh. */ virtual int register_handler (int signum, ACE_Event_Handler *new_sh, @@ -548,16 +548,19 @@ public: * @see cancel_timer() * @see reset_timer_interval() * - * @param event_handler event handler to schedule on reactor - * @param arg argument passed to the handle_timeout() method of event_handler - * @param delay time interval after which the timer will expire - * @param interval time interval after which the timer will be automatically rescheduled + * @param event_handler Event handler to schedule on reactor + * @param arg Argument passed to the handle_timeout() method of + * event_handler + * @param delay Time interval after which the timer will expire + * @param interval Time interval after which the timer will be automatically + * rescheduled * @return -1 on failure, a timer_id value on success */ virtual long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, const ACE_Time_Value &delay, - const ACE_Time_Value &interval = ACE_Time_Value::zero); + const ACE_Time_Value &interval = + ACE_Time_Value::zero); /** * Reset recurring timer interval. @@ -717,7 +720,8 @@ public: * be called. */ virtual int purge_pending_notifications (ACE_Event_Handler *eh, - ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK); + ACE_Reactor_Mask = + ACE_Event_Handler::ALL_EVENTS_MASK); // = Assorted helper methods. @@ -843,7 +847,7 @@ protected: /// the implementation instance int delete_implementation_; - /// Pointer to a process-wide <ACE_Reactor> singleton. + /// Pointer to a process-wide ACE_Reactor singleton. static ACE_Reactor *reactor_; /// Must delete the <reactor_> singleton if non-0. diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h index 77114c6cbe8..51cca18517e 100644 --- a/ace/Reactor_Impl.h +++ b/ace/Reactor_Impl.h @@ -110,7 +110,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * <ACE_Event_Handler> object. Returns the number of notifications + * ACE_Event_Handler object. Returns the number of notifications * purged. Returns -1 on error. */ virtual int purge_pending_notifications (ACE_Event_Handler * = 0, @@ -152,7 +152,7 @@ public: /// Set a user-specified timer queue. virtual int timer_queue (ACE_Timer_Queue *tq) = 0; - /// Return the current <ACE_Timer_Queue>. + /// Return the current ACE_Timer_Queue. virtual ACE_Timer_Queue *timer_queue (void) const = 0; /// Close down and release all resources. @@ -179,7 +179,7 @@ public: * application wishes to handle events for some fixed amount of * time. * - * Returns the total number of <ACE_Event_Handler>s that were + * Returns the total number of ACE_Event_Handlers that were * dispatched, 0 if the <max_wait_time> elapsed without dispatching * any handlers, or -1 if an error occurs. * @@ -469,7 +469,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * <ACE_Event_Handler> object. Returns the number of notifications + * ACE_Event_Handler object. Returns the number of notifications * purged. Returns -1 on error. */ virtual int purge_pending_notifications (ACE_Event_Handler * = 0, diff --git a/ace/Reactor_Notification_Strategy.h b/ace/Reactor_Notification_Strategy.h index 61ae0ce6120..5d38f5609a6 100644 --- a/ace/Reactor_Notification_Strategy.h +++ b/ace/Reactor_Notification_Strategy.h @@ -27,7 +27,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief Used to notify an ACE_Reactor * - * Integrates the <ACE_Message_Queue> notification into the + * Integrates the ACE_Message_Queue notification into the * <ACE_Reactor::notify> method. */ class ACE_Export ACE_Reactor_Notification_Strategy : public ACE_Notification_Strategy diff --git a/ace/Recursive_Thread_Mutex.h b/ace/Recursive_Thread_Mutex.h index c315151b7af..e5ad28df15c 100644 --- a/ace/Recursive_Thread_Mutex.h +++ b/ace/Recursive_Thread_Mutex.h @@ -103,7 +103,7 @@ public: int tryacquire_write (void); /** - * This is only here to make the <ACE_Recursive_Thread_Mutex> + * This is only here to make the ACE_Recursive_Thread_Mutex * interface consistent with the other synchronization APIs. * Assumes the caller has already acquired the mutex using one of * the above calls, and returns 0 (success) always. diff --git a/ace/SOCK_SEQPACK_Association.h b/ace/SOCK_SEQPACK_Association.h index 0574c7c2918..600744bdb5b 100644 --- a/ace/SOCK_SEQPACK_Association.h +++ b/ace/SOCK_SEQPACK_Association.h @@ -82,7 +82,7 @@ public: /// Constructor. ACE_SOCK_SEQPACK_Association (void); - /// Constructor (sets the underlying <ACE_HANDLE> with <h>). + /// Constructor (sets the underlying ACE_HANDLE with <h>). ACE_SOCK_SEQPACK_Association (ACE_HANDLE h); /// Destructor. diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h index 552f09ad178..4ee850e7dfb 100644 --- a/ace/Select_Reactor_Base.h +++ b/ace/Select_Reactor_Base.h @@ -38,6 +38,7 @@ typedef int (ACE_Event_Handler::*ACE_EH_PTMF) (ACE_HANDLE); // Forward declaration. class ACE_Select_Reactor_Impl; +class ACE_Sig_Handler; /* * Hook to specialize the Select_Reactor_Base implementation diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp index 2dbe8ca7b71..7913f91eefe 100644 --- a/ace/Select_Reactor_T.cpp +++ b/ace/Select_Reactor_T.cpp @@ -1489,7 +1489,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void) select_width = 0; # else select_width = int (h) + 1; -# endif /* ACE_WIN64 */ +# endif /* ACE_WIN32 */ if (ACE_OS::select (select_width, rd_mask, 0, 0, diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h index c4cb77bae4a..bb9cdceed61 100644 --- a/ace/Select_Reactor_T.h +++ b/ace/Select_Reactor_T.h @@ -198,7 +198,7 @@ public: */ virtual void deactivate (int do_stop); - // = Register and remove <ACE_Event_Handler>s. + // = Register and remove ACE_Event_Handlers. /** * Register a <eh> with a particular <mask>. Note that the * <Select_Reactor> will call <ACE_Event_Handler::get_handle> to @@ -381,7 +381,7 @@ public: int dont_call_handle_close = 1); /** - * Cancel the single <ACE_Event_Handler> that matches the <timer_id> + * Cancel the single ACE_Event_Handler that matches the <timer_id> * value (which was returned from the <schedule> method). If arg is * non-NULL then it will be set to point to the ``magic cookie'' * argument passed in when the <Event_Handler> was registered. This @@ -615,9 +615,9 @@ protected: // = Dispatching methods. /** - * Template Method that dispatches <ACE_Event_Handler>s for time + * Template Method that dispatches ACE_Event_Handlers for time * events, I/O events, and signal events. Returns the total number - * of <ACE_Event_Handler>s that were dispatched or -1 if something + * of ACE_Event_Handlers that were dispatched or -1 if something * goes wrong. */ virtual int dispatch (int nfound, diff --git a/ace/Select_Reactor_T.inl b/ace/Select_Reactor_T.inl index 984b8db7769..0ad9033f9a0 100644 --- a/ace/Select_Reactor_T.inl +++ b/ace/Select_Reactor_T.inl @@ -3,6 +3,7 @@ // $Id$ #include "ace/Reactor.h" +#include "ace/Signal.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ace/Service_Object.h b/ace/Service_Object.h index 2526d622f26..6101372c5f1 100644 --- a/ace/Service_Object.h +++ b/ace/Service_Object.h @@ -34,9 +34,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * implementations. * * Classes that inherit from <ACE_Service_Objects> are capable - * of being registered with the <ACE_Reactor> (due to the - * <ACE_Event_Handler>, as well as being dynamically linked by - * the <ACE_Service_Config> (due to the <ACE_Shared_Object>). + * of being registered with the ACE_Reactor (due to the + * ACE_Event_Handler, as well as being dynamically linked by + * the ACE_Service_Config (due to the <ACE_Shared_Object>). */ class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Shared_Object { @@ -142,7 +142,7 @@ private: * @class ACE_Service_Object_Ptr * * @brief This is a smart pointer that holds onto the associated - * <ACE_Service_Object> * until the current scope is left, at + * ACE_Service_Object * until the current scope is left, at * which point the object's <fini> hook is called and the * service_object_ gets deleted. * diff --git a/ace/Signal.h b/ace/Signal.h index 44f9fcb826b..12c61562e2d 100644 --- a/ace/Signal.h +++ b/ace/Signal.h @@ -266,11 +266,11 @@ private: * objects to handle signals in a way that avoids the use of * global/static variables and functions. * - * Using this class a program can register an <ACE_Event_Handler> + * Using this class a program can register an ACE_Event_Handler * with the <ACE_Sig_Handler> in order to handle a designated * <signum>. When a signal occurs that corresponds to this * <signum>, the <handle_signal> method of the registered - * <ACE_Event_Handler> is invoked automatically. + * ACE_Event_Handler is invoked automatically. */ class ACE_Export ACE_Sig_Handler { @@ -281,8 +281,8 @@ public: // = Registration and removal methods. /** - * Add a new <ACE_Event_Handler> and a new sigaction associated with - * <signum>. Passes back the existing <ACE_Event_Handler> and its + * Add a new ACE_Event_Handler and a new sigaction associated with + * <signum>. Passes back the existing ACE_Event_Handler and its * sigaction if pointers are non-zero. Returns -1 on failure and >= * 0 on success. */ @@ -293,7 +293,7 @@ public: ACE_Sig_Action *old_disp = 0); /** - * Remove the <ACE_Event_Handler> currently associated with + * Remove the ACE_Event_Handler currently associated with * <signum>. <sigkey> is ignored in this implementation since there * is only one instance of a signal handler. Install the new * disposition (if given) and return the previous disposition (if @@ -317,7 +317,7 @@ public: /// Return the <ACE_Sig_Handler> associated with <signum>. virtual ACE_Event_Handler *handler (int signum); - /// Set a new <ACE_Event_Handler> that is associated with <signum>. + /// Set a new ACE_Event_Handler that is associated with <signum>. /// Return the existing handler. virtual ACE_Event_Handler *handler (int signum, ACE_Event_Handler *); @@ -340,7 +340,7 @@ protected: // = These methods and data members are shared by derived classes. /** - * Set a new <ACE_Event_Handler> that is associated with <signum>. + * Set a new ACE_Event_Handler that is associated with <signum>. * Return the existing handler. Does not acquire any locks so that * it can be called from a signal handler, such as <dispatch>. */ @@ -351,8 +351,8 @@ protected: * This implementation method is called by <register_handler> and * <dispatch>. It doesn't do any locking so that it can be called * within a signal handler, such as <dispatch>. It adds a new - * <ACE_Event_Handler> and a new sigaction associated with <signum>. - * Passes back the existing <ACE_Event_Handler> and its sigaction if + * ACE_Event_Handler and a new sigaction associated with <signum>. + * Passes back the existing ACE_Event_Handler and its sigaction if * pointers are non-zero. Returns -1 on failure and >= 0 on * success. */ @@ -378,7 +378,7 @@ private: * @class ACE_Sig_Adapter * * @brief Provide an adapter that transforms various types of signal - * handlers into the scheme used by the <ACE_Reactor>. + * handlers into the scheme used by the ACE_Reactor. */ class ACE_Export ACE_Sig_Adapter : public ACE_Event_Handler { @@ -389,7 +389,7 @@ public: ~ACE_Sig_Adapter (void); /// Returns this signal key that's used to remove this from the - /// <ACE_Reactor>'s internal table. + /// ACE_Reactor's internal table. int sigkey (void); /// Called by the <Reactor> to dispatch the signal handler. @@ -454,7 +454,7 @@ public: ACE_Sig_Action *old_disp = 0); /** - * Remove an <ACE_Event_Handler> currently associated with <signum>. + * Remove an ACE_Event_Handler currently associated with <signum>. * We remove the handler if (1) its <sigkey> matches the <sigkey> * passed as a parameter or (2) if we've been told to remove all the * handlers, i.e., <sigkey> == -1. If a new disposition is given it @@ -474,7 +474,7 @@ public: virtual ACE_Event_Handler *handler (int signum); /** - * Set a new <ACE_Event_Handler> that is associated with SIGNUM at + * Set a new ACE_Event_Handler that is associated with SIGNUM at * the head of the list of signals. Return the existing handler * that was at the head. */ diff --git a/ace/Svc_Handler.h b/ace/Svc_Handler.h index 29e5e3934d1..062bb91cf5a 100644 --- a/ace/Svc_Handler.h +++ b/ace/Svc_Handler.h @@ -250,7 +250,7 @@ protected: * its connected peer and supports buffering. * * The buffering feature makes it possible to queue up - * <ACE_Message_Blocks> in an <ACE_Message_Queue> until (1) the + * <ACE_Message_Blocks> in an ACE_Message_Queue until (1) the * queue is "full" or (2) a period of time elapses, at which * point the queue is "flushed" via <sendv_n> to the peer. */ @@ -262,7 +262,7 @@ public: /** * Constructor initializes the <thr_mgr> and <mq> by passing them * down to the <ACE_Task> base class. The <reactor> is passed to - * the <ACE_Event_Handler>. The <max_buffer_size> and + * the ACE_Event_Handler. The <max_buffer_size> and * <relative_timeout> are used to determine at what point to flush * the <mq>. By default, there's no buffering at all. The * <relative_timeout> value is interpreted to be in a unit that's @@ -278,8 +278,8 @@ public: virtual ~ACE_Buffered_Svc_Handler (void); /** - * Insert the <ACE_Message_Block> chain rooted at <message_block> - * into the <ACE_Message_Queue> with the designated <timeout>. The + * Insert the ACE_Message_Block chain rooted at <message_block> + * into the ACE_Message_Queue with the designated <timeout>. The * <flush> method will be called if this <put> causes the number of * bytes to exceed the maximum buffer size or if the timeout period * has elapsed. @@ -287,8 +287,8 @@ public: virtual int put (ACE_Message_Block *message_block, ACE_Time_Value *timeout = 0); - /// Flush the <ACE_Message_Queue>, which writes all the queued - /// <ACE_Message_Block>s to the <PEER_STREAM>. + /// Flush the ACE_Message_Queue, which writes all the queued + /// ACE_Message_Blocks to the <PEER_STREAM>. virtual int flush (void); /// This method is not currently implemented -- this is where the @@ -300,8 +300,8 @@ public: void dump (void) const; protected: - /// Implement the flush operation on the <ACE_Message_Queue>, which - /// writes all the queued <ACE_Message_Block>s to the <PEER_STREAM>. + /// Implement the flush operation on the ACE_Message_Queue, which + /// writes all the queued ACE_Message_Blocks to the <PEER_STREAM>. /// Assumes that the caller holds the lock. virtual int flush_i (void); diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index a04b59cd7eb..88ffe893a11 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -20,9 +20,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE (ACE_TP_Reactor) int -ACE_TP_Token_Guard::grab_token (ACE_Time_Value *max_wait_time) +ACE_TP_Token_Guard::acquire_read_token (ACE_Time_Value *max_wait_time) { - ACE_TRACE ("ACE_TP_Token_Guard::grab_token"); + ACE_TRACE ("ACE_TP_Token_Guard::acquire_read_token"); // The order of these events is very subtle, modify with care. @@ -157,7 +157,7 @@ ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) // this thread. ACE_TP_Token_Guard guard (this->token_); - int result = guard.grab_token (max_wait_time); + int result = guard.acquire_read_token (max_wait_time); // If the guard is NOT the owner just return the retval if (!guard.is_owner ()) @@ -545,18 +545,9 @@ ACE_TP_Reactor::get_event_for_dispatching (ACE_Time_Value *max_wait_time) // yet have a size_ > 0. This is an attempt to remedy the affect, // without knowing why it happens. - //# if !(defined (__SUNPRO_CC) && (__SUNPRO_CC > 0x500)) - // SunCC seems to be having problems with this piece of code - // here. I am not sure why though. This works fine with other - // compilers. As we dont seem to understand when this piece of - // code is needed and as it creates problems for SunCC we will - // not compile this. Most of the tests in TAO seem to be happy - // without this in SunCC. this->ready_set_.rd_mask_.sync (this->ready_set_.rd_mask_.max_set ()); this->ready_set_.wr_mask_.sync (this->ready_set_.wr_mask_.max_set ()); this->ready_set_.ex_mask_.sync (this->ready_set_.ex_mask_.max_set ()); - //# endif /* ! __SUNPRO_CC */ - } return this->wait_for_multiple_events (this->ready_set_, diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h index 5efc002cd1d..3dbbb220027 100644 --- a/ace/TP_Reactor.h +++ b/ace/TP_Reactor.h @@ -46,7 +46,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * @brief This structure contains information of the activated event * handler. */ -class ACE_Export ACE_EH_Dispatch_Info +class ACE_EH_Dispatch_Info { public: @@ -86,7 +86,7 @@ private: * and manages the ownership */ -class ACE_Export ACE_TP_Token_Guard +class ACE_TP_Token_Guard { public: @@ -106,13 +106,12 @@ public: /// A helper method that grabs the token for us, after which the /// thread that owns that can do some actual work. - /// @todo Should probably be called acquire_read_token () - int grab_token (ACE_Time_Value *max_wait_time = 0); + int acquire_read_token (ACE_Time_Value *max_wait_time = 0); /** * A helper method that grabs the token for us, after which the * thread that owns that can do some actual work. This differs from - * grab_token () as it uses acquire () to get the token instead of + * acquire_read_token() as it uses acquire () to get the token instead of * acquire_read () */ int acquire_token (ACE_Time_Value *max_wait_time = 0); @@ -122,6 +121,10 @@ private: // Disallow default construction. ACE_TP_Token_Guard (void); + // Disallow copying and assignment. + ACE_TP_Token_Guard (const ACE_TP_Token_Guard &); + ACE_TP_Token_Guard &operator= (const ACE_TP_Token_Guard &); + private: /// The Select Reactor token. @@ -181,7 +184,7 @@ public: /** * Initialize the ACE_TP_Reactor to manage * @a max_number_of_handles. If @a restart is non-0 then the - * <ACE_Reactor>'s <handle_events> method will be restarted + * ACE_Reactor's <handle_events> method will be restarted * automatically when <EINTR> occurs. If <signal_handler> or * <timer_queue> are non-0 they are used as the signal handler and * timer queue, respectively. @@ -208,7 +211,7 @@ public: * application wishes to handle events for some fixed amount of * time. * - * Returns the total number of <ACE_Event_Handler>s that were + * Returns the total number of ACE_Event_Handlers that were * dispatched, 0 if the <max_wait_time> elapsed without dispatching * any handlers, or -1 if something goes wrong. */ @@ -302,7 +305,7 @@ protected: int dispatch_i (ACE_Time_Value *max_wait_time, ACE_TP_Token_Guard &guard); - /// Get the event that needs dispatching.It could be either a + /// Get the event that needs dispatching. It could be either a /// signal, timer, notification handlers or return possibly 1 I/O /// handler for dispatching. In the most common use case, this would /// return 1 I/O handler for dispatching diff --git a/ace/Test_and_Set.h b/ace/Test_and_Set.h index 10917e8578f..d72c3d474b0 100644 --- a/ace/Test_and_Set.h +++ b/ace/Test_and_Set.h @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * This class keeps track of the status of <is_set_>, which can * be set based on various events (such as receipt of a - * signal). This class is derived from <ACE_Event_Handler> so + * signal). This class is derived from ACE_Event_Handler so * that it can be "signaled" by a Reactor when a signal occurs. * We assume that <TYPE> is a data type that can be assigned the * value 0 or 1. diff --git a/ace/Thread_Mutex.h b/ace/Thread_Mutex.h index f75640f4e30..5b1877fb82c 100644 --- a/ace/Thread_Mutex.h +++ b/ace/Thread_Mutex.h @@ -44,7 +44,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * ACE_Thread_Mutex is recursive on some platforms (like * Win32). However, on most platforms (like Solaris) it is not * recursive. To be totally safe and portable, developers - * should use <ACE_Recursive_Thread_Mutex> when they need a + * should use ACE_Recursive_Thread_Mutex when they need a * recursive mutex. */ class ACE_Export ACE_Thread_Mutex @@ -69,10 +69,10 @@ public: int acquire (void); /** - * Block the thread until we acquire the mutex or until <tv> times + * Block the thread until we acquire the mutex or until @a tv times * out, in which case -1 is returned with <errno> == <ETIME>. Note - * that <tv> is assumed to be in "absolute" rather than "relative" - * time. The value of <tv> is updated upon return to show the + * that @a tv is assumed to be in "absolute" rather than "relative" + * time. The value of @a tv is updated upon return to show the * actual (absolute) acquisition time. */ int acquire (ACE_Time_Value &tv); diff --git a/ace/Time_Value.cpp b/ace/Time_Value.cpp index cc6de548ea1..d7a00ba5aa4 100644 --- a/ace/Time_Value.cpp +++ b/ace/Time_Value.cpp @@ -119,7 +119,7 @@ void ACE_Time_Value::set (const FILETIME &file_time) // Convert 100ns units to seconds; this->tv_.tv_sec = (long) (LL_100ns / ((double) (10000 * 1000))); // Convert remainder to microseconds; - this->tv_.tv_usec = (long)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10); + this->tv_.tv_usec = (suseconds_t)((LL_100ns % ((ACE_UINT32)(10000 * 1000))) / 10); #else // Don't use a struct initializer, gcc don't like it. ULARGE_INTEGER _100ns; @@ -131,7 +131,7 @@ void ACE_Time_Value::set (const FILETIME &file_time) // Convert 100ns units to seconds; this->tv_.tv_sec = (long) (_100ns.QuadPart / (10000 * 1000)); // Convert remainder to microseconds; - this->tv_.tv_usec = (long) ((_100ns.QuadPart % (10000 * 1000)) / 10); + this->tv_.tv_usec = (suseconds_t) ((_100ns.QuadPart % (10000 * 1000)) / 10); #endif // ACE_LACKS_LONGLONG_T this->normalize (); } diff --git a/ace/Time_Value.h b/ace/Time_Value.h index 0a40f1d766b..5216a56c676 100644 --- a/ace/Time_Value.h +++ b/ace/Time_Value.h @@ -21,9 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS_DIAB_MIPS) -# include "ace/os_include/sys/os_time.h" -#endif /* ACE_HAS_WINCE ACE_PSOS_DIAB_MIPS */ +# include "ace/os_include/os_time.h" // Define some helpful constants. // Not type-safe, and signed. For backward compatibility. @@ -31,24 +29,6 @@ #define ACE_ONE_SECOND_IN_USECS 1000000L #define ACE_ONE_SECOND_IN_NSECS 1000000000L -# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS) -// Definition per POSIX. -typedef struct timespec -{ - /// Seconds - time_t tv_sec; - /// Nanoseconds - long tv_nsec; -} timespec_t; -# elif defined (ACE_HAS_BROKEN_POSIX_TIME) -// OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs -# include /**/ <sys/timers.h> -# endif /* !ACE_HAS_POSIX_TIME */ - -# if defined(ACE_LACKS_TIMESPEC_T) -typedef struct timespec timespec_t; -# endif /* ACE_LACKS_TIMESPEC_T */ - // needed for ACE_UINT64 #include "ace/Basic_Types.h" @@ -106,7 +86,7 @@ public: ACE_Time_Value (void); /// Constructor. - explicit ACE_Time_Value (time_t sec, long usec = 0); + explicit ACE_Time_Value (time_t sec, suseconds_t usec = 0); // = Methods for converting to/from various time formats. @@ -122,7 +102,7 @@ public: # endif /* ACE_WIN32 */ /// Initializes the ACE_Time_Value from seconds and useconds. - void set (time_t sec, long usec); + void set (time_t sec, suseconds_t usec); /// Initializes the ACE_Time_Value from a double, which is assumed to be /// in second format, with any remainder treated as microseconds. @@ -208,10 +188,10 @@ public: * @note The semantics of this method differs from the msec() * method. */ - long usec (void) const; + suseconds_t usec (void) const; /// Set microseconds. - void usec (long usec); + void usec (suseconds_t usec); #if !defined (ACE_LACKS_LONGLONG_T) /** @@ -316,7 +296,7 @@ public: const ACE_Time_Value &tv); friend ACE_Export ACE_Time_Value operator * (const ACE_Time_Value &tv, - double d); + double d); //@} /// Dump is a no-op. diff --git a/ace/Time_Value.inl b/ace/Time_Value.inl index ed46b2afc32..b49e84c52c5 100644 --- a/ace/Time_Value.inl +++ b/ace/Time_Value.inl @@ -49,7 +49,7 @@ ACE_Time_Value::operator const timeval * () const } ACE_INLINE void -ACE_Time_Value::set (time_t sec, long usec) +ACE_Time_Value::set (time_t sec, suseconds_t usec) { // ACE_OS_TRACE ("ACE_Time_Value::set"); this->tv_.tv_sec = sec; @@ -69,7 +69,7 @@ ACE_Time_Value::set (double d) // ACE_OS_TRACE ("ACE_Time_Value::set"); long l = (long) d; this->tv_.tv_sec = l; - this->tv_.tv_usec = (long) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5); + this->tv_.tv_usec = (suseconds_t) ((d - (double) l) * ACE_ONE_SECOND_IN_USECS + .5); this->normalize (); } @@ -97,7 +97,7 @@ ACE_Time_Value::ACE_Time_Value (void) } ACE_INLINE -ACE_Time_Value::ACE_Time_Value (time_t sec, long usec) +ACE_Time_Value::ACE_Time_Value (time_t sec, suseconds_t usec) { // ACE_OS_TRACE ("ACE_Time_Value::ACE_Time_Value"); this->set (sec, usec); @@ -155,7 +155,7 @@ ACE_Time_Value::msec (long milliseconds) // Returns number of micro-seconds. -ACE_INLINE long +ACE_INLINE suseconds_t ACE_Time_Value::usec (void) const { // ACE_OS_TRACE ("ACE_Time_Value::usec"); @@ -165,7 +165,7 @@ ACE_Time_Value::usec (void) const // Sets the number of micro-seconds. ACE_INLINE void -ACE_Time_Value::usec (long usec) +ACE_Time_Value::usec (suseconds_t usec) { // ACE_OS_TRACE ("ACE_Time_Value::usec"); this->tv_.tv_usec = usec; diff --git a/ace/Timer_Hash_T.h b/ace/Timer_Hash_T.h index 587a8178ae7..c7eee094c63 100644 --- a/ace/Timer_Hash_T.h +++ b/ace/Timer_Hash_T.h @@ -245,7 +245,7 @@ public: */ virtual int expire (const ACE_Time_Value ¤t_time); - /// Returns a pointer to this <ACE_Timer_Queue>'s iterator. + /// Returns a pointer to this ACE_Timer_Queue's iterator. virtual ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &iter (void); /// Removes the earliest node from the queue and returns it diff --git a/ace/Timer_Heap_T.h b/ace/Timer_Heap_T.h index 5f027f85ed5..068aa0bfb67 100644 --- a/ace/Timer_Heap_T.h +++ b/ace/Timer_Heap_T.h @@ -162,7 +162,7 @@ public: const void **act = 0, int dont_call_handle_close = 1); - /// Returns a pointer to this <ACE_Timer_Queue>'s iterator. + /// Returns a pointer to this ACE_Timer_Queue's iterator. virtual ACE_Timer_Queue_Iterator_T<TYPE, FUNCTOR, ACE_LOCK> &iter (void); /** diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index 74794d8a93b..d2ff5946c3a 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -50,7 +50,7 @@ public: /// Constructor /** * Register the SIGALRM handler. If @a mask == 0 then block all - * signals when <SIGALRM> is run. Otherwise, just block the signals + * signals when @c SIGALRM is run. Otherwise, just block the signals * indicated in @a mask. */ ACE_Async_Timer_Queue_Adapter (ACE_Sig_Set *mask = 0); @@ -71,7 +71,7 @@ public: /// passed in. int cancel (long timer_id, const void **act = 0); - /// Dispatch all timers whose values are <= <cur_time>. Returns the + /// Dispatch all timers whose values are <= cur_time. Returns the /// number of timers canceled. int expire (void); diff --git a/ace/Timer_Queue_T.h b/ace/Timer_Queue_T.h index b4edda5387e..604079a41da 100644 --- a/ace/Timer_Queue_T.h +++ b/ace/Timer_Queue_T.h @@ -164,7 +164,7 @@ private: * @class ACE_Timer_Queue_Iterator_T * * @brief Generic interface for iterating over a subclass of - * <ACE_Timer_Queue>. + * ACE_Timer_Queue. * * This is a generic iterator that can be used to visit every * node of a timer queue. Be aware that it isn't guaranteed @@ -380,7 +380,7 @@ public: /// Accessor to the upcall functor FUNCTOR &upcall_functor (void); - /// Returns a pointer to this <ACE_Timer_Queue>'s iterator. + /// Returns a pointer to this ACE_Timer_Queue's iterator. virtual ITERATOR &iter (void) = 0; /// Removes the earliest node from the queue and returns it diff --git a/ace/Unbounded_Queue.cpp b/ace/Unbounded_Queue.cpp index 37060bc9633..cde3e6679b6 100644 --- a/ace/Unbounded_Queue.cpp +++ b/ace/Unbounded_Queue.cpp @@ -134,7 +134,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void) this->allocator_->free, ACE_Node, <T>); - this->cur_size_--; + --this->cur_size_; // @@ Doesnt make sense to have this check since // this will always be true. // ACE_ASSERT (this->cur_size_ >= 0); @@ -174,7 +174,7 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item) // just a pointer to the dummy node. this->head_->next_ = temp; - this->cur_size_++; + ++this->cur_size_; return 0; } @@ -201,7 +201,7 @@ ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item) // Point the head to the new dummy node. this->head_ = temp; - this->cur_size_++; + ++this->cur_size_; return 0; } diff --git a/ace/Unbounded_Set.cpp b/ace/Unbounded_Set.cpp index d86c91095ff..c3a444ccd8a 100644 --- a/ace/Unbounded_Set.cpp +++ b/ace/Unbounded_Set.cpp @@ -46,7 +46,7 @@ ACE_Unbounded_Set<T>::insert_tail (const T &item) // Point the head to the new dummy node. this->head_ = temp; - this->cur_size_++; + ++this->cur_size_; return 0; } @@ -107,7 +107,7 @@ ACE_Unbounded_Set<T>::delete_nodes (void) this->allocator_->free, ACE_Node, <T>); - this->cur_size_--; + --this->cur_size_; } // Reset the list to be a circular list with just a dummy node. @@ -227,7 +227,7 @@ ACE_Unbounded_Set<T>::remove (const T &item) ACE_Node<T> *temp = curr->next_; // Skip over the node that we're deleting. curr->next_ = temp->next_; - this->cur_size_--; + --this->cur_size_; ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free, ACE_Node, diff --git a/ace/Unbounded_Set.h b/ace/Unbounded_Set.h index 963c6d80f00..8cddab86f12 100644 --- a/ace/Unbounded_Set.h +++ b/ace/Unbounded_Set.h @@ -98,8 +98,8 @@ public: // = Iteration methods. - /// Pass back the <next_item> that hasn't been seen in the Set. - /// Returns 0 when all items have been seen, else 1. + /// Pass back the @a next_item that hasn't been seen in the Set. + /// @return Returns 0 when all items have been seen, else 1. int next (T *&next_item); /// Move forward by one element in the set. Returns 0 when all the diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h index 906bc3cf704..8e3cdb4cc28 100644 --- a/ace/WFMO_Reactor.h +++ b/ace/WFMO_Reactor.h @@ -97,8 +97,8 @@ public: /** * @class ACE_WFMO_Reactor_Handler_Repository * - * @brief Used to map <ACE_HANDLE>s onto the appropriate - * <ACE_Event_Handler> * and other information. + * @brief Used to map ACE_HANDLEs onto the appropriate + * ACE_Event_Handler * and other information. */ class ACE_Export ACE_WFMO_Reactor_Handler_Repository { @@ -308,7 +308,7 @@ public: // = Search structure operations. - /// Bind the <ACE_Event_Handler *> to the <ACE_HANDLE>. This is for + /// Bind the <ACE_Event_Handler *> to the ACE_HANDLE. This is for /// the simple event entry. int bind (ACE_HANDLE, ACE_Event_Handler *); @@ -321,7 +321,7 @@ public: ACE_HANDLE event_handle, int delete_event); - /// Remove the binding of <ACE_HANDLE> in accordance with the <mask>. + /// Remove the binding of ACE_HANDLE in accordance with the <mask>. int unbind (ACE_HANDLE, ACE_Reactor_Mask mask); @@ -342,12 +342,12 @@ public: /// Maximum ACE_HANDLE value, plus 1. DWORD max_handlep1 (void) const; - /// Pointer to the beginning of the current array of <ACE_HANDLE> + /// Pointer to the beginning of the current array of ACE_HANDLE /// *'s. ACE_HANDLE *handles (void) const; /// Pointer to the beginning of the current array of - /// <ACE_Event_Handler> *'s. + /// ACE_Event_Handler *'s. Current_Info *current_info (void) const; /// Check if changes to the handle set are required. @@ -397,15 +397,15 @@ public: /// current_suspended_info_ from to_be_added_info_ int make_changes_in_to_be_added_infos (void); - /// Removes the <ACE_Event_Handler> at <slot> from the table. + /// Removes the ACE_Event_Handler at <slot> from the table. int remove_handler_i (size_t slot, ACE_Reactor_Mask mask); - /// Removes the <ACE_Event_Handler> at <slot> from the table. + /// Removes the ACE_Event_Handler at <slot> from the table. int remove_suspended_handler_i (size_t slot, ACE_Reactor_Mask mask); - /// Removes the <ACE_Event_Handler> at <slot> from the table. + /// Removes the ACE_Event_Handler at <slot> from the table. int remove_to_be_added_handler_i (size_t slot, ACE_Reactor_Mask to_be_removed_masks); @@ -481,7 +481,7 @@ protected: * @class ACE_WFMO_Reactor_Notify * * @brief Unblock the <ACE_WFMO_Reactor> from its event loop, passing - * it an optional <ACE_Event_Handler> to dispatch. + * it an optional ACE_Event_Handler to dispatch. * * This implementation is necessary for cases where the * <ACE_WFMO_Reactor> is run in a multi-threaded program. In @@ -489,7 +489,7 @@ protected: * <WaitForMultipleObjects> when updates occur other than in the * main <ACE_WFMO_Reactor> thread. To do this, we signal an * auto-reset event the <ACE_WFMO_Reactor> is listening on. If - * an <ACE_Event_Handler> and <ACE_Reactor_Mask> is passed to + * an ACE_Event_Handler and <ACE_Reactor_Mask> is passed to * <notify>, the appropriate <handle_*> method is dispatched. */ class ACE_Export ACE_WFMO_Reactor_Notify : public ACE_Reactor_Notify @@ -509,7 +509,7 @@ public: /** * Special trick to unblock <WaitForMultipleObjects> when updates * occur. All we do is enqueue <event_handler> and <mask> onto the - * <ACE_Message_Queue> and wakeup the <WFMO_Reactor> by signaling + * ACE_Message_Queue and wakeup the <WFMO_Reactor> by signaling * its <ACE_Event> handle. The <ACE_Time_Value> indicates how long * to blocking trying to notify the <WFMO_Reactor>. If <timeout> == * 0, the caller will block until action is possible, else will wait @@ -568,7 +568,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * <ACE_Event_Handler> object. If <eh> == 0, all notifications for all + * ACE_Event_Handler object. If <eh> == 0, all notifications for all * handlers are removed (but not any notifications posted just to wake up * the reactor itself). Returns the number of notifications purged. * Returns -1 on error. @@ -736,7 +736,7 @@ public: * * <WaitForMultipleObjects> is used as the demultiplexing call * - * Returns the total number of I/O and timer <ACE_Event_Handler>s + * Returns the total number of I/O and timer ACE_Event_Handlers * that were dispatched, 0 if the <max_wait_time> elapsed without * dispatching any handlers, or -1 if an error occurs. * @@ -779,7 +779,7 @@ public: // = Register and remove Handlers. /** - * Register an <ACE_Event_Handler> <event_handler>. Since no Event + * Register an ACE_Event_Handler <event_handler>. Since no Event * Mask is passed through this interface, it is assumed that the * <handle> being passed in is an event handle and when the event * becomes signaled, <WFMO_Reactor> will call handle_signal on @@ -791,7 +791,7 @@ public: ACE_HANDLE event_handle = ACE_INVALID_HANDLE); /** - * Register an <ACE_Event_Handler> <event_handle>. <mask> specifies + * Register an ACE_Event_Handler <event_handle>. <mask> specifies * the network events that the <event_handler> is interested in. If * <io_handle> == <ACE_INVALID_HANDLE> the <ACE_WFMO_Reactor> will * call the <get_handle> method of <event_handler> to extract the @@ -1063,7 +1063,7 @@ public: /** * Purge any notifications pending in this reactor for the specified - * <ACE_Event_Handler> object. Returns the number of notifications + * ACE_Event_Handler object. Returns the number of notifications * purged. Returns -1 on error. */ virtual int purge_pending_notifications (ACE_Event_Handler * = 0, diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp index 161601990a5..cfbc911bdcd 100644 --- a/ace/WIN32_Proactor.cpp +++ b/ace/WIN32_Proactor.cpp @@ -87,11 +87,7 @@ ACE_WIN32_Proactor::close (void) { ACE_OVERLAPPED *overlapped = 0; u_long bytes_transferred = 0; -#if defined (ACE_WIN64) ULONG_PTR completion_key = 0; -#else - ULONG completion_key = 0; -#endif /* ACE_WIN64 */ // Get the next asynchronous operation that completes BOOL res = ::GetQueuedCompletionStatus diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h index 494d272a0e8..e34a1cbb3e8 100644 --- a/ace/config-WinCE.h +++ b/ace/config-WinCE.h @@ -175,6 +175,7 @@ #define ACE_LACKS_STRERROR #define ACE_LACKS_SYSTEM #define ACE_LACKS_SIGACTION +#define ACE_LACKS_PIPE #define ACE_LACKS_CUSERID #define ACE_LACKS_CHDIR diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h index dd63f88811c..6e03157b0f1 100644 --- a/ace/config-aix-4.x.h +++ b/ace/config-aix-4.x.h @@ -72,9 +72,6 @@ # undef WEXITSTATUS # if (__IBMCPP__ >= 500) /* Visual Age C++ 5 */ -# if !defined (ACE_HAS_USING_KEYWORD) -# define ACE_HAS_USING_KEYWORD 1 -# endif /* ACE_HAS_USING_KEYWORD */ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # endif /* __IBMCPP__ >= 500 */ diff --git a/ace/config-borland-common.h b/ace/config-borland-common.h index 480924e0736..23e9f9bbd84 100644 --- a/ace/config-borland-common.h +++ b/ace/config-borland-common.h @@ -56,15 +56,12 @@ # define ACE_HAS_TEMPLATE_TYPEDEFS 1 # define ACE_HAS_TYPENAME_KEYWORD 1 # define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_HAS_USING_KEYWORD 1 # define ACE_LACKS_ACE_IOSTREAM 1 -# define ACE_LACKS_INLINE_ASSEMBLY 1 # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 # define ACE_LACKS_NATIVE_STRPTIME 1 # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 # define ACE_LACKS_PRAGMA_ONCE 1 -# define ACE_NEW_THROWS_EXCEPTIONS 1 -# define ACE_SIZEOF_LONG_DOUBLE 10 +# define ACE_HAS_NEW_NOTHROW # define ACE_TEMPLATES_REQUIRE_SOURCE 1 # define ACE_UINT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Lu") # define ACE_INT64_FORMAT_SPECIFIER ACE_LIB_TEXT ("%Ld") diff --git a/ace/config-cray.h b/ace/config-cray.h index de2a4dcadbc..4ebb1ad830a 100644 --- a/ace/config-cray.h +++ b/ace/config-cray.h @@ -46,8 +46,6 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_USING_KEYWORD - #define ACE_HAS_SSIZE_T #define ACE_HAS_SYSV_IPC @@ -87,7 +85,7 @@ #define ACE_HAS_POSIX_NONBLOCK // Platform has POSIX terminal interface. -#define ACE_HAS_TERMIOS +#define ACE_HAS_TERMIOS #define ACE_HAS_DIRENT diff --git a/ace/config-cxx-common.h b/ace/config-cxx-common.h index d118b6bb3f6..f4549840c55 100644 --- a/ace/config-cxx-common.h +++ b/ace/config-cxx-common.h @@ -37,7 +37,6 @@ # define ACE_HAS_TEMPLATE_SPECIALIZATION # define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD # define ACE_ENDLESS_LOOP \ unsigned int ace_endless_loop____ = 0; if (ace_endless_loop____) break; diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h index 6b928396456..d779436acd3 100644 --- a/ace/config-doxygen.h +++ b/ace/config-doxygen.h @@ -16,7 +16,7 @@ #define ACE_CONFIG_DOXYGEN_H /// Make sure that we always turn inlining on. -#defind __ACE_INLINE__ +#define __ACE_INLINE__ /// Make the wchar_t interfaces available. #define ACE_HAS_WCHAR @@ -100,9 +100,6 @@ /// Generate strptime documentation #define ACE_HAS_STRPTIME -/// Doxygen is capable of parsing using -#define ACE_HAS_USING_KEYWORD - /// Generate icmp documentation #define ACE_HAS_ICMP_SUPPORT 1 diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 0428cf5f65f..0886e0442a0 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -16,7 +16,6 @@ #define ACE_HAS_TYPENAME_KEYWORD #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_TEMPLATE_SPECIALIZATION -#define ACE_HAS_USING_KEYWORD #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_TEMPLATES_REQUIRE_SOURCE diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h index 32c62e416a6..2003350903b 100644 --- a/ace/config-hpux-10.x-hpc++.h +++ b/ace/config-hpux-10.x-hpc++.h @@ -98,10 +98,6 @@ // Compiler supports the 'typename' qualifier. # define ACE_HAS_TYPENAME_KEYWORD -// This is legit for A.01.12 and probably at least as far back as A.01.07. -// Before that, not sure. But you shouldn't be there anyway ;-) -# define ACE_HAS_USING_KEYWORD - // Platform lacks streambuf "linebuffered ()". # define ACE_LACKS_LINEBUFFERED_STREAMBUF diff --git a/ace/config-hpux-11.00.h b/ace/config-hpux-11.00.h index 77ed2072589..c1deab4581a 100644 --- a/ace/config-hpux-11.00.h +++ b/ace/config-hpux-11.00.h @@ -114,9 +114,6 @@ // used as formal arguments to a template class. # define ACE_HAS_TEMPLATE_TYPEDEFS -// This is legit for A.03.05 - not sure A.03.04, but it should be. -# define ACE_HAS_USING_KEYWORD - # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR // Platform lacks streambuf "linebuffered ()". diff --git a/ace/config-icc-common.h b/ace/config-icc-common.h index c52b7192188..13dc505d45e 100644 --- a/ace/config-icc-common.h +++ b/ace/config-icc-common.h @@ -12,11 +12,24 @@ # define ACE_HAS_TYPENAME_KEYWORD # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_TEMPLATE_SPECIALIZATION -# define ACE_HAS_USING_KEYWORD # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRING_CLASS +#if defined (ACE_HAS_CUSTOM_EXPORT_MACROS) && ACE_HAS_CUSTOM_EXPORT_MACROS == 0 +# undef ACE_HAS_CUSTOM_EXPORT_MACROS +#else +# ifndef ACE_HAS_CUSTOM_EXPORT_MACROS +# define ACE_HAS_CUSTOM_EXPORT_MACROS +# endif /* !ACE_HAS_CUSTOM_EXPORT_MACROS */ +# define ACE_Proper_Export_Flag __attribute__ ((visibility("default"))) +# define ACE_Proper_Import_Flag +# define ACE_EXPORT_SINGLETON_DECLARATION(T) template class ACE_Proper_Export_Flag T +# define ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) template class ACE_Proper_Export_Flag SINGLETON_TYPE <CLASS, LOCK>; +# define ACE_IMPORT_SINGLETON_DECLARATION(T) __extension__ extern template class T +# define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>; +#endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ + // __EXCEPTIONS is defined with -fexceptions, the egcs default. It // is not defined with -fno-exceptions, the ACE default for g++. // ACE_HAS_EXCEPTIONS is defined in diff --git a/ace/config-integritySCA.h b/ace/config-integritySCA.h index 7e56765a0f2..4e68818b99b 100644 --- a/ace/config-integritySCA.h +++ b/ace/config-integritySCA.h @@ -35,7 +35,6 @@ #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define ACE_HAS_TEMPLATE_TYPEDEFS #define TAO_USE_SEQUENCE_TEMPLATES -#define ACE_HAS_USING_KEYWORD #define ACE_NEEDS_FUNC_DEFINITIONS #define _REENTRANT #define ACE_MT_SAFE 1 diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h index 0af266cd458..16e7d5e04fe 100644 --- a/ace/config-irix6.x-sgic++.h +++ b/ace/config-irix6.x-sgic++.h @@ -17,7 +17,6 @@ #if _COMPILER_VERSION >= 720 #define ACE_HAS_TEMPLATE_SPECIALIZATION #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION -#define ACE_HAS_USING_KEYWORD # ifdef _STANDARD_C_PLUS_PLUS # define ACE_HAS_TYPENAME_KEYWORD # endif /* _STANDARD_C_PLUS_PLUS */ diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h index 13eeea19663..8b290109a96 100644 --- a/ace/config-kcc-common.h +++ b/ace/config-kcc-common.h @@ -50,8 +50,6 @@ // Compiler doesn't support static data member templates. //#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_HAS_USING_KEYWORD - // Define this if you want to use the standard C++ library #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_HAS_STRING_CLASS diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h index 5b22360253d..00e6f216edd 100644 --- a/ace/config-lynxos.h +++ b/ace/config-lynxos.h @@ -43,6 +43,7 @@ #define ACE_HAS_ALLOCA #define ACE_HAS_ALLOCA_H #define ACE_HAS_AUTOMATIC_INIT_FINI +#define ACE_HAS_CHARPTR_SHMAT #define ACE_HAS_CLOCK_GETTIME #define ACE_HAS_CLOCK_SETTIME #define ACE_HAS_CPLUSPLUS_HEADERS @@ -150,11 +151,6 @@ #define ACE_HAS_BROKEN_PREALLOCATED_OBJECTS_AFTER_FORK 1 -// Looks like the modern compilers have support for namespaces. Or -// rather we dont support any compiler without this support. Need to -// get this macro off of ACE. -#define ACE_HAS_USING_KEYWORD - #if __GNUC__ == 2 && __GNUC_MINOR__ == 9 // config-g++-common.h defines these incorrectly for LynxOS 3.x // with G++ version 2.9-gnupro-98r2 diff --git a/ace/config-macros.h b/ace/config-macros.h index 821d7a61ae7..76cebb7c105 100644 --- a/ace/config-macros.h +++ b/ace/config-macros.h @@ -90,14 +90,10 @@ # endif /* ACE_HAS_VALGRIND */ #if !defined (ACE_LACKS_DEPRECATED_MACROS) -# if defined (ACE_HAS_USING_KEYWORD) /** * @deprecated The @c ACE_HAS_USING macros are deprecated */ # define ACE_USING using -# else -# define ACE_USING -# endif /* ACE_HAS_USING_KEYWORD */ #endif /* !ACE_LACKS_DEPRECATED_MACROS */ # if defined (ACE_HAS_TYPENAME_KEYWORD) diff --git a/ace/config-netbsd.h b/ace/config-netbsd.h index b29941cd676..1c7f52f3cf7 100644 --- a/ace/config-netbsd.h +++ b/ace/config-netbsd.h @@ -82,7 +82,6 @@ #define ACE_HAS_TYPENAME_KEYWORD 1 #define ACE_HAS_UALARM 1 #define ACE_HAS_UCONTEXT_T 1 -#define ACE_HAS_USING_KEYWORD 1 #define ACE_HAS_VOIDPTR_MMAP 1 #define ACE_HAS_VOIDPTR_SOCKOPT 1 #define ACE_HAS_WCHAR 1 diff --git a/ace/config-openvms.h b/ace/config-openvms.h index 759f338f113..2b62888e805 100644 --- a/ace/config-openvms.h +++ b/ace/config-openvms.h @@ -266,10 +266,6 @@ functions.*/ #define ACE_HAS_UALARM 1 /*Platform supports ualarm()*/ -#define ACE_HAS_USING_KEYWORD 1 - /*Compiler supports the new - using keyword for C++ - namespaces.*/ #define ACE_HAS_VOIDPTR_MMAP 1 /*Platform requires void * for mmap().*/ diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h index df07bab7f38..4f1815bf4b4 100644 --- a/ace/config-osf1-4.0.h +++ b/ace/config-osf1-4.0.h @@ -64,7 +64,6 @@ # define ACE_HAS_STDCPP_STL_INCLUDES # define ACE_HAS_TEMPLATE_SPECIALIZATION # define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD #elif defined (__KCC) # define ACE_HAS_STRING_CLASS # include "ace/config-kcc-common.h" diff --git a/ace/config-psos-diab-mips.h b/ace/config-psos-diab-mips.h index 3bfb8c20725..8e827eabea3 100644 --- a/ace/config-psos-diab-mips.h +++ b/ace/config-psos-diab-mips.h @@ -34,6 +34,7 @@ #define ACE_USE_RCSID 0 #endif /* #if !defined (ACE_USE_RCSID) */ +#define ACE_LACKS_ENV #define ACE_LACKS_SETEGID #define ACE_LACKS_SETPGID #define ACE_LACKS_SETSID diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h index 9af973db179..213a0193dc4 100644 --- a/ace/config-psos-diab-ppc.h +++ b/ace/config-psos-diab-ppc.h @@ -41,6 +41,7 @@ # define ACE_HAS_EXCEPTIONS #endif /* __GNUG__ */ +#define ACE_LACKS_ENV #define ACE_LACKS_SETEGID #define ACE_LACKS_SETPGID #define ACE_LACKS_SETREGID diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h index ed7a5bdc303..6e7ba0e87ad 100644 --- a/ace/config-psos-diab.h +++ b/ace/config-psos-diab.h @@ -15,6 +15,7 @@ # undef __ACE_INLINE__ #endif /* __ACE_INLINE__ */ +#define ACE_LACKS_ENV #define ACE_LACKS_ALARM #define ACE_LACKS_ISATTY #define ACE_LACKS_UMASK diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h index 8d946c1bae0..ae9d9649a98 100644 --- a/ace/config-psos-tm.h +++ b/ace/config-psos-tm.h @@ -19,6 +19,7 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ +#define ACE_LACKS_ENV #define ACE_LACKS_WAIT #define ACE_LACKS_WAITPID #define ACE_HAS_STRDUP_EMULATION diff --git a/ace/config-psosim-g++.h b/ace/config-psosim-g++.h index 532edd7ee01..3642dc93460 100644 --- a/ace/config-psosim-g++.h +++ b/ace/config-psosim-g++.h @@ -53,6 +53,7 @@ #endif /* __GNUG__ */ #define ACE_HAS_IP_MULTICAST +#define ACE_LACKS_ENV #define ACE_LACKS_WAIT #define ACE_LACKS_WAITPID #define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h index 34075494933..9694237791b 100644 --- a/ace/config-sunos5.5.h +++ b/ace/config-sunos5.5.h @@ -38,8 +38,7 @@ // If -compat=4 is turned on, the old 4.2 settings for iostreams are used, // but the newer, explicit instantiation is used (above) # if (__SUNPRO_CC_COMPAT >= 5) -# define ACE_HAS_USING_KEYWORD -# define ACE_HAS_TEMPLATE_TYPEDEFS +# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST @@ -261,6 +260,10 @@ // SunOS 5.5.x does not support mkstemp #define ACE_LACKS_MKSTEMP +#if !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION - 0 >= 4)_ +# define ACE_HAS_CHARPTR_SHMDT +#endif + // Platform has posix getpwnam_r #if (defined (_POSIX_C_SOURCE) && _POSIX_C_SOURCE - 0 >= 199506L) || \ defined(_POSIX_PTHREAD_SEMANTICS) diff --git a/ace/config-sunos5.6.h b/ace/config-sunos5.6.h index 8a846c577ef..c0904971830 100644 --- a/ace/config-sunos5.6.h +++ b/ace/config-sunos5.6.h @@ -54,9 +54,6 @@ #ifndef ACE_HAS_TYPENAME_KEYWORD #define ACE_HAS_TYPENAME_KEYWORD 1 #endif /* ACE_HAS_TYPENAME_KEYWORD */ -#ifndef ACE_HAS_USING_KEYWORD -#define ACE_HAS_USING_KEYWORD 1 -#endif /* ACE_HAS_USING_KEYWORD */ #ifndef ACE_HAS_THR_C_DEST #define ACE_HAS_THR_C_DEST 1 #endif /* ACE_HAS_THR_C_DEST */ diff --git a/ace/config-tandem-nsk-mips-v2.h b/ace/config-tandem-nsk-mips-v2.h index d9d6a6749a1..cba5b7b8148 100644 --- a/ace/config-tandem-nsk-mips-v2.h +++ b/ace/config-tandem-nsk-mips-v2.h @@ -399,9 +399,6 @@ extern int cma_sigwait (sigset_t *); // Following will not be needed if use standard c library (G06.20 and later) #define ACE_LACKS_SIGNED_CHAR -// Compiler supports the new using keyword for C++ namespaces. -#define ACE_HAS_USING_KEYWORD - //========================================================================= // Build options //========================================================================= diff --git a/ace/config-tandem-nsk-mips-v3.h b/ace/config-tandem-nsk-mips-v3.h index 911f259f2e4..c98533aff5d 100644 --- a/ace/config-tandem-nsk-mips-v3.h +++ b/ace/config-tandem-nsk-mips-v3.h @@ -418,9 +418,6 @@ extern int cma_sigwait (sigset_t *); // Following will not be needed if use standard c library (G06.20 and later) #define ACE_LACKS_SIGNED_CHAR -// Compiler supports the new using keyword for C++ namespaces. -#define ACE_HAS_USING_KEYWORD - // Compiler supports the typename keyword for templates #define ACE_HAS_TYPENAME_KEYWORD diff --git a/ace/config-unixware-7.1.0.udk.h b/ace/config-unixware-7.1.0.udk.h index 0a1dc9c5c8f..e1b9cfb6c41 100644 --- a/ace/config-unixware-7.1.0.udk.h +++ b/ace/config-unixware-7.1.0.udk.h @@ -366,9 +366,6 @@ /* Compiler supports the C++ typename keyword */ #define ACE_HAS_TYPENAME_KEYWORD 1 -/* Compiler supports the new using keyword for C++ namespaces. */ -#define ACE_HAS_USING_KEYWORD 1 - /* Prints out console message in ACE_NOTSUP. Useful for tracking down origin of ACE_NOTSUP. */ /* #undef ACE_HAS_VERBOSE_NOTSUP */ diff --git a/ace/config-vxworks5.x.h b/ace/config-vxworks5.x.h index d718b4a8052..04600396906 100644 --- a/ace/config-vxworks5.x.h +++ b/ace/config-vxworks5.x.h @@ -90,8 +90,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 0 -# define ACE_HAS_USING_KEYWORD - # define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && ! ghs && !__DCC__ */ diff --git a/ace/config-vxworks6.2.h b/ace/config-vxworks6.2.h index d4bb4cbc1dd..da623b1997d 100644 --- a/ace/config-vxworks6.2.h +++ b/ace/config-vxworks6.2.h @@ -63,7 +63,6 @@ # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# define ACE_HAS_USING_KEYWORD # define ACE_TEMPLATES_REQUIRE_SOURCE #else /* ! __GNUG__ && ! ghs && !__DCC__ */ diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h index 0b381beb4f2..8a00efaea88 100644 --- a/ace/config-win32-borland.h +++ b/ace/config-win32-borland.h @@ -67,11 +67,20 @@ #define ACE_LACKS_NET_IF_H #define ACE_LACKS_SYS_IPC_H #define ACE_LACKS_SYS_SEM_H -#define ACE_LACKS_STDINT_H -#define ACE_LACKS_DIRENT_H #define ACE_LACKS_SYS_IOCTL_H #define ACE_LACKS_STROPTS_H +#undef ACE_LACKS_STRUCT_DIR +#undef ACE_LACKS_CLOSEDIR +#undef ACE_LACKS_OPENDIR +#undef ACE_LACKS_READDIR +#undef ACE_LACKS_REWINDDIR + +#define ACE_HAS_WOPENDIR +#define ACE_HAS_WCLOSEDIR +#define ACE_HAS_WREADDIR +#define ACE_HAS_WREWINDDIR + #define ACE_LACKS_STRRECVFD #define ACE_USES_EXPLICIT_STD_NAMESPACE diff --git a/ace/config-win32-dmc.h b/ace/config-win32-dmc.h index 92948184653..6012e44620e 100644 --- a/ace/config-win32-dmc.h +++ b/ace/config-win32-dmc.h @@ -60,10 +60,8 @@ # define ACE_HAS_TYPENAME_KEYWORD 1 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_HAS_USING_KEYWORD 1 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 # define ACE_LACKS_NATIVE_STRPTIME 1 -//# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 //# define ACE_LACKS_PRAGMA_ONCE 1 //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 diff --git a/ace/config-win32-ghs.h b/ace/config-win32-ghs.h index b14d90d2636..2d332f58e16 100644 --- a/ace/config-win32-ghs.h +++ b/ace/config-win32-ghs.h @@ -68,11 +68,9 @@ # define ACE_HAS_TYPENAME_KEYWORD 1 //# define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION # define ACE_HAS_USER_MODE_MASKS 1 -# define ACE_HAS_USING_KEYWORD 1 # define ACE_LACKS_ACE_IOSTREAM 1 //# define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 # define ACE_LACKS_NATIVE_STRPTIME 1 -//# define ACE_LACKS_PLACEMENT_OPERATOR_DELETE 1 //# define ACE_LACKS_PRAGMA_ONCE 1 # define ACE_LACKS_STRRECVFD 1 //# define ACE_NEW_THROWS_EXCEPTIONS 1 diff --git a/ace/config-win32-msvc-6.h b/ace/config-win32-msvc-6.h index d5cc7028607..63c40e60d54 100644 --- a/ace/config-win32-msvc-6.h +++ b/ace/config-win32-msvc-6.h @@ -44,7 +44,6 @@ // Keywords # define ACE_HAS_TYPENAME_KEYWORD -# define ACE_HAS_USING_KEYWORD // No support for member templates. #define ACE_LACKS_MEMBER_TEMPLATES diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h index 82892f5986a..22e99f200c8 100644 --- a/ace/config-win32-msvc-7.h +++ b/ace/config-win32-msvc-7.h @@ -38,7 +38,6 @@ #endif #define ACE_HAS_TYPENAME_KEYWORD -#define ACE_HAS_USING_KEYWORD #define ACE_HAS_ITOA diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h index 6a1533ea03f..62d7fce1130 100644 --- a/ace/config-win32-msvc-8.h +++ b/ace/config-win32-msvc-8.h @@ -38,7 +38,6 @@ #endif #define ACE_HAS_TYPENAME_KEYWORD -#define ACE_HAS_USING_KEYWORD #define ACE_HAS_ITOA diff --git a/ace/config-win32-visualage.h b/ace/config-win32-visualage.h index 670a7af4fb6..681381fc945 100644 --- a/ace/config-win32-visualage.h +++ b/ace/config-win32-visualage.h @@ -66,7 +66,6 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION 1 #define ACE_HAS_TEMPLATE_TYPEDEFS 1 #define ACE_HAS_TYPENAME_KEYWORD 1 -#define ACE_HAS_USING_KEYWORD 1 #define ACE_LACKS_ACE_IOSTREAM 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 #define ACE_LACKS_NATIVE_STRPTIME 1 diff --git a/ace/os_include/os_dirent.h b/ace/os_include/os_dirent.h index f33e63c3842..fc2bcb18575 100644 --- a/ace/os_include/os_dirent.h +++ b/ace/os_include/os_dirent.h @@ -70,6 +70,8 @@ struct dirent { ACE_TCHAR *d_name; }; +#define ACE_DIRENT dirent + struct ACE_DIR { /// The name of the directory we are looking into ACE_TCHAR *directory_name_; @@ -78,7 +80,7 @@ struct ACE_DIR { HANDLE current_handle_; /// The struct for the results - dirent *dirent_; + ACE_DIRENT *dirent_; /// The struct for intermediate results. ACE_TEXT_WIN32_FIND_DATA fdata_; @@ -97,9 +99,16 @@ struct ACE_DIR /// The directory entry struct dirent dirent; }; + +#define ACE_DIRENT dirent + +#elif defined (ACE_WIN32) && (__BORLANDC__) && defined (ACE_USES_WCHAR) +#define ACE_DIRENT wdirent +typedef wDIR ACE_DIR; #else +#define ACE_DIRENT dirent typedef DIR ACE_DIR; -# endif /* ACE_LACKS_STRUCT_DIR */ +#endif /* ACE_LACKS_STRUCT_DIR */ #if defined rewinddir # undef rewinddir diff --git a/ace/os_include/os_time.h b/ace/os_include/os_time.h index 78300ba24be..a6a4fabe69e 100644 --- a/ace/os_include/os_time.h +++ b/ace/os_include/os_time.h @@ -53,6 +53,24 @@ using std::timezone; using std::difftime; # endif /* ACE_USES_STD_NAMESPACE_FOR_STDC_LIB */ +# if !defined (ACE_HAS_POSIX_TIME) && !defined (ACE_PSOS) +// Definition per POSIX. +typedef struct timespec +{ + /// Seconds + time_t tv_sec; + /// Nanoseconds + long tv_nsec; +} timespec_t; +# elif defined (ACE_HAS_BROKEN_POSIX_TIME) +// OSF/1 defines struct timespec in <sys/timers.h> - Tom Marrs +# include /**/ <sys/timers.h> +# endif /* !ACE_HAS_POSIX_TIME */ + +# if defined(ACE_LACKS_TIMESPEC_T) +typedef struct timespec timespec_t; +# endif /* ACE_LACKS_TIMESPEC_T */ + // Place all additions (especially function declarations) within extern "C" {} #ifdef __cplusplus extern "C" |