diff options
Diffstat (limited to 'ACE/ace/config-lite.h')
| -rw-r--r-- | ACE/ace/config-lite.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 55d11f9a46a..27a63cf6ca9 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -46,7 +46,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // For use by <ACE_OS::exit>. extern "C" { - typedef void (*ACE_EXIT_HOOK) (void); + typedef void (*ACE_EXIT_HOOK) (); } // Signature for registering a cleanup function that is used by the @@ -83,11 +83,11 @@ typedef void (*ACE_INIT_LOG_MSG_HOOK) (ACE_OS_Log_Msg_Attributes &attr typedef void (*ACE_INHERIT_LOG_MSG_HOOK) (ACE_OS_Thread_Descriptor*, ACE_OS_Log_Msg_Attributes &); -typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (void); +typedef void (*ACE_CLOSE_LOG_MSG_HOOK) (); typedef void (*ACE_SYNC_LOG_MSG_HOOK) (const ACE_TCHAR *prog_name); -typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (void); +typedef ACE_OS_Thread_Descriptor *(*ACE_THR_DESC_LOG_MSG_HOOK) (); ACE_END_VERSIONED_NAMESPACE_DECL @@ -121,16 +121,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. # include <Cstd/stdcomp.h> #endif /* __SUNPRO_CC <= 0x5110 */ -#if (defined (_MSC_VER) && (_MSC_VER <= 1310) && defined (_WIN64)) \ - || defined (ACE_HAS_BROKEN_STD_REVERSE_ITERATOR) - // VC 7.1 and the latest 64-bit platform SDK still don't define a standard - // compliant reverse_iterator adapter. -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator<iterator, value_type> reverse_iterator; \ - typedef std::reverse_iterator<const_iterator, \ - value_type const> const_reverse_iterator; -#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ + && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) # define ACE_DECLARE_STL_REVERSE_ITERATORS \ typedef std::reverse_iterator<iterator, \ std::input_iterator_tag, \ @@ -150,7 +142,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL typedef std::reverse_iterator<const_iterator> const_reverse_iterator; #endif /* _MSC_VER && _WIN64 */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ |