diff options
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Based_Pointer_Repository.cpp | 2 | ||||
| -rw-r--r-- | ace/Date_Time.h | 3 | ||||
| -rw-r--r-- | ace/Date_Time.i | 7 | ||||
| -rw-r--r-- | ace/Dynamic.cpp | 2 | ||||
| -rw-r--r-- | ace/Event_Handler_T.i | 2 | ||||
| -rw-r--r-- | ace/Log_Msg_NT_Event_Log.cpp | 4 | ||||
| -rw-r--r-- | ace/Log_Msg_NT_Event_Log.h | 4 | ||||
| -rw-r--r-- | ace/Module.h | 6 | ||||
| -rw-r--r-- | ace/README | 9 | ||||
| -rw-r--r-- | ace/config-doxygen.h | 3 | ||||
| -rw-r--r-- | ace/config-win32-common.h | 4 | ||||
| -rw-r--r-- | ace/config-win32-mingw.h | 37 |
12 files changed, 36 insertions, 47 deletions
diff --git a/ace/Based_Pointer_Repository.cpp b/ace/Based_Pointer_Repository.cpp index fa6c7e4c842..d3b5193610a 100644 --- a/ace/Based_Pointer_Repository.cpp +++ b/ace/Based_Pointer_Repository.cpp @@ -121,7 +121,7 @@ template class ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex>; #pragma instantiate ACE_Map_Iterator<void *, size_t, ACE_Null_Mutex> #pragma instantiate ACE_Map_Reverse_Iterator<void *, size_t, ACE_Null_Mutex> #pragma instantiate ACE_Map_Iterator_Base<void *, size_t, ACE_Null_Mutex> -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) template ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX> * ACE_Singleton<ACE_Based_Pointer_Repository, ACE_SYNCH_RW_MUTEX>::singleton_; #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/ace/Date_Time.h b/ace/Date_Time.h index 52df165365a..4343059a2f3 100644 --- a/ace/Date_Time.h +++ b/ace/Date_Time.h @@ -34,6 +34,9 @@ public: /// Constructor initializes current time/date info. ACE_Date_Time (void); + /// Constructor initializes with the given ACE_Time_Value + ACE_EXPLICIT ACE_Date_Time (const ACE_Time_Value& timevalue); + /// Constructor with init values, no check for validy /// Set/get portions of ACE_Date_Time, no check for validity. ACE_Date_Time (long day, diff --git a/ace/Date_Time.i b/ace/Date_Time.i index 9678fbc0081..2480a88001a 100644 --- a/ace/Date_Time.i +++ b/ace/Date_Time.i @@ -34,6 +34,13 @@ ACE_Date_Time::ACE_Date_Time (void) this->update (); } +ASYS_INLINE +ACE_Date_Time::ACE_Date_Time (const ACE_Time_Value& timevalue) +{ + ACE_TRACE ("ACE_Date_Time::ACE_Date_Time: timevalue"); + this->update (timevalue); +} + // Constructor with init values, no check for validy ASYS_INLINE ACE_Date_Time::ACE_Date_Time (long day, diff --git a/ace/Dynamic.cpp b/ace/Dynamic.cpp index 9d6f1f9b670..4042cd56402 100644 --- a/ace/Dynamic.cpp +++ b/ace/Dynamic.cpp @@ -36,7 +36,7 @@ ACE_Dynamic::instance (void) #pragma instantiate ACE_TSS<ACE_Dynamic> # endif /* ACE_HAS_THREADS && (ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION) */ -#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux)) +#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS)) template ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex> * ACE_TSS_Singleton<ACE_Dynamic, ACE_Null_Mutex>::singleton_; diff --git a/ace/Event_Handler_T.i b/ace/Event_Handler_T.i index b31415f7b73..31d030c555f 100644 --- a/ace/Event_Handler_T.i +++ b/ace/Event_Handler_T.i @@ -19,7 +19,7 @@ template<class T> ACE_INLINE ACE_HANDLE ACE_Event_Handler_T<T>::get_handle (void) const { ACE_TRACE ("ACE_Event_Handler_T<T>::get_handle"); - return this->get_handle_ == 0 ? -1 : (this->op_handler_->*get_handle_) (); + return this->get_handle_ == 0 ? ACE_INVALID_HANDLE : (this->op_handler_->*get_handle_) (); } template<class T> ACE_INLINE void diff --git a/ace/Log_Msg_NT_Event_Log.cpp b/ace/Log_Msg_NT_Event_Log.cpp index d9b82fb2d16..ed3c29cb0c6 100644 --- a/ace/Log_Msg_NT_Event_Log.cpp +++ b/ace/Log_Msg_NT_Event_Log.cpp @@ -2,7 +2,7 @@ #include "ace/config-all.h" -#if defined (WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if defined (ACE_HAS_LOG_MSG_NT_EVENT_LOG) #include "ace/Log_Msg_NT_Event_Log.h" #include "ace/Log_Msg.h" @@ -150,4 +150,4 @@ ACE_Log_Msg_NT_Event_Log::log (ACE_Log_Record &log_record) return 0; } -#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* ACE_HAS_LOG_MSG_NT_EVENT_LOG */ diff --git a/ace/Log_Msg_NT_Event_Log.h b/ace/Log_Msg_NT_Event_Log.h index f379c1dfc1a..b901aea2e00 100644 --- a/ace/Log_Msg_NT_Event_Log.h +++ b/ace/Log_Msg_NT_Event_Log.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (WIN32) && !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +#if defined ACE_HAS_LOG_MSG_NT_EVENT_LOG #include "ace/Log_Msg_Backend.h" @@ -62,7 +62,7 @@ private: HANDLE evlog_handle_; }; -#endif /* ACE_WIN32 && !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ +#endif /* ACE_HAS_LOG_MSG_NT_EVENT_LOG */ #include "ace/post.h" #endif /* ACE_LOG_MSG_NT_EVENT_LOG_H */ diff --git a/ace/Module.h b/ace/Module.h index c515ae350df..092f0f915e7 100644 --- a/ace/Module.h +++ b/ace/Module.h @@ -81,8 +81,8 @@ public: /// Shutdown the Module. ~ACE_Module (void); - /// Create an initialized module with <module_name> as its identity - /// and <reader> and <writer> as its tasks. + /// Create an initialized module with @a module_name as its identity + /// and @a reader and @a writer as its tasks. ACE_Module (const ACE_TCHAR *module_name, ACE_Task<ACE_SYNCH_USE> *writer = 0, ACE_Task<ACE_SYNCH_USE> *reader = 0, @@ -136,7 +136,7 @@ public: */ void reader (ACE_Task<ACE_SYNCH_USE> *q, int flags = M_DELETE_READER); - /// Set and get pointer to sibling <ACE_Task> in an <ACE_Module> + /// Set and get pointer to sibling ACE_Task in an ACE_Module ACE_Task<ACE_SYNCH_USE> *sibling (ACE_Task<ACE_SYNCH_USE> *orig); // = Identify the module diff --git a/ace/README b/ace/README index 07555825c1f..e21894fbb75 100644 --- a/ace/README +++ b/ace/README @@ -370,6 +370,9 @@ ACE_HAS_LIMITED_RUSAGE_T The rusage_t structure has only two fields. ACE_HAS_LIMITED_SELECT The select is unable to deal with large file descriptors. +ACE_HAS_LOG_MSG_NT_EVENT_LOG Platform supports Windows NT event + log so we can create an + ACE_Log_Msg_Backend to log to it. ACE_HAS_LONG_MAP_FAILED Platform defines MAP_FAILED as a long constant. ACE_HAS_MALLOC_STATS Enabled malloc statistics @@ -439,7 +442,7 @@ ACE_HAS_POSIX_NONBLOCK Platform supports POSIX O_NONBLOCK semantics ACE_HAS_POSIX_REALTIME_SIGNALS Platform supports POSIX RT signals. Corresponds to _POSIX_REALTIME_SIGNALS - constant in <unistd.h>. + constant in <unistd.h>. ACE_HAS_POSIX_SEM Platform supports POSIX real-time semaphores (e.g., VxWorks and Solaris). Corresponds @@ -807,8 +810,8 @@ ACE_LACKS_PARAM_H Platform lacks <sys/param.h> ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering of multicast dgrams at the socket level. If == 1, ACE_SOCK_Dgram_Mcast will bind - the first joined multicast group to the - socket, and all future joins on that + the first joined multicast group to the + socket, and all future joins on that socket will fail with an error. ACE_LACKS_POSIX_PROTOTYPES Platform lacks POSIX prototypes for certain System diff --git a/ace/config-doxygen.h b/ace/config-doxygen.h index 92971ac7c68..85b492322c6 100644 --- a/ace/config-doxygen.h +++ b/ace/config-doxygen.h @@ -97,4 +97,7 @@ /// Generate ACE_Event_Handler_T documentation #define ACE_HAS_TEMPLATE_TYPEDEFS +/// Generate ACE_Log_Msg_NT_Event_Log documentation +#define ACE_HAS_LOG_MSG_NT_EVENT_LOG + #endif /* ACE_CONFIG_DOXYGEN_H */ diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index d3fc29ab4b5..fcefdfdebf5 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -565,5 +565,9 @@ typedef unsigned long long ACE_UINT64; # define ACE_DISABLES_THREAD_LIBRARY_CALLS 0 #endif /* ACE_DISABLES_THREAD_LIBRARY_CALLS */ +#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_PHARLAP) +# define ACE_HAS_LOG_MSG_NT_EVENT_LOG +#endif /* !ACE_HAS_WINCE && !ACE_HAS_PHARLAP */ + #include "ace/post.h" #endif /* ACE_CONFIG_WIN32_COMMON_H */ diff --git a/ace/config-win32-mingw.h b/ace/config-win32-mingw.h index af590f6003b..e4cc77e30de 100644 --- a/ace/config-win32-mingw.h +++ b/ace/config-win32-mingw.h @@ -11,7 +11,7 @@ #include "ace/pre.h" #ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header +# error Use config-win32.h in config.h instead of this header #endif /* ACE_CONFIG_WIN32_H */ #define ACE_CC_NAME ACE_LIB_TEXT ("g++") @@ -37,8 +37,8 @@ #define ACE_LACKS_MODE_MASKS #define ACE_HAS_USER_MODE_MASKS -#if (__MINGW32_MAJOR_VERSION == 0) && (__MINGW32_MINOR_VERSION < 5) -#error You need a newer version (>= 0.5) of mingw32/w32api +#if (__MINGW32_MAJOR_VERSION < 2) +# error You need a newer version (>= 2.0) of mingw32/w32api #endif #define ACE_LACKS_STRRECVFD @@ -61,36 +61,5 @@ #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) -#if ( __W32API_MAJOR_VERSION < 1) || ((__W32API_MAJOR_VERSION == 1) && (__W32API_MINOR_VERSION <= 5)) - -// The MingW32 w32api version 1.50 and lower don't define these types and methods -// but we need it in the Win32_Asynch_IO.cpp - -extern "C" { - - typedef void *PVOID,*LPVOID; - - /* FIXME for __WIN64 */ - #ifndef __ptr64 - #define __ptr64 - #endif - typedef void* __ptr64 PVOID64; - - // - // Define segement buffer structure for scatter/gather read/write. - // - typedef union _FILE_SEGMENT_ELEMENT { - PVOID64 Buffer; - ULONGLONG Alignment; - }FILE_SEGMENT_ELEMENT, *PFILE_SEGMENT_ELEMENT; - - - BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); - - BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED); -} - -#endif - #include "ace/post.h" #endif /* ACE_CONFIG_WIN32_MINGW_H */ |