diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 09:48:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-11-15 09:48:02 +0000 |
| commit | 3c03a34dde72d7f18224c52ece3941dbc22f5a39 (patch) | |
| tree | 584688814b985325b922793640ef09b54f4c6613 /ACE/ace/Proactor.h | |
| parent | f4c102818377b27276bb83af618ceca603f604f9 (diff) | |
| download | ATCD-3c03a34dde72d7f18224c52ece3941dbc22f5a39.tar.gz | |
Mon Nov 15 09:40:48 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* Makefile.am:
Zap TAO as directory
* ACEXML/common/XML_Types.h:
* ace/Auto_Ptr.h:
* ace/Basic_Types.h:
* ace/OS_NS_Thread.cpp:
* ace/Obchunk.cpp:
* ace/Object_Manager.cpp:
* ace/Object_Manager_Base.cpp:
* ace/Proactor.h:
* ace/SOCK_Dgram.h:
* ace/SOCK_Dgram.inl:
* ace/SOCK_Dgram_Mcast.h:
* ace/SOCK_Dgram_Mcast.cpp:
* ace/SString.h:
* ace/SString.cpp:
* ace/Thread_Exit.cpp:
* ace/Timer_List.h:
* ace/config-lite.h:
* apps/JAWS/clients/Caching/Locator_Request_Reply.cpp:
* apps/JAWS/clients/Caching/URL_Properties.h:
* apps/JAWS/clients/Caching/URL_Properties.inl:
* apps/JAWS/clients/Caching/URL_Properties.cpp:
Clean of deprecated define ACE_USHORT16 and ACE_AUTO_PTR_RESET
* configure.ac:
Updated support address
Diffstat (limited to 'ACE/ace/Proactor.h')
| -rw-r--r-- | ACE/ace/Proactor.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ACE/ace/Proactor.h b/ACE/ace/Proactor.h index 704eef416ff..18f2c2c0e27 100644 --- a/ACE/ace/Proactor.h +++ b/ACE/ace/Proactor.h @@ -323,8 +323,8 @@ public: const void *act, const ACE_Time_Value &interval); - // Same as above except @a interval it is used to reschedule the - // @a handler automatically. + /// Same as above except @a interval it is used to reschedule the + /// @a handler automatically. /// This combines the above two methods into one. Mostly for backward /// compatibility. @@ -357,7 +357,7 @@ public: * @param wait_time the time to wait for an event to occur. This is * a relative time. On successful return, the time is updated to * reflect the amount of time spent waiting for event(s) to occur. - * @return Returns 0 if no events occur before the wait_time expires. + * @return Returns 0 if no events occur before the @a wait_time expires. * Returns 1 when a completion is dispatched. On error, returns -1 * and sets errno accordingly. */ |