diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-28 11:01:50 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-11-28 11:01:50 +0000 |
commit | 490263a66ccc06b14e14e59ec9ea1134c3cd22e1 (patch) | |
tree | 654c014f7965dc0056ee96a95e202eb3d0bef02c /ACE/ace | |
parent | 20f2fd21a35acf0862fbb80eb8f0645b4377b556 (diff) | |
download | ATCD-490263a66ccc06b14e14e59ec9ea1134c3cd22e1.tar.gz |
Fri Nov 28 10:59:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace')
42 files changed, 305 insertions, 149 deletions
diff --git a/ACE/ace/Arg_Shifter.h b/ACE/ace/Arg_Shifter.h index 9e109a425a4..8439e92ef51 100644 --- a/ACE/ace/Arg_Shifter.h +++ b/ACE/ace/Arg_Shifter.h @@ -106,7 +106,7 @@ public: * If the current argument does not match flag * If there is no parameter found after a 'matched' flag * - * If the flag is matched and the flag and paramter DO NOT RUN + * If the flag is matched and the flag and parameter DO NOT RUN * together, the flag is consumed, the parameter is returned, * and the new current argument is the parameter value. * ie '-foobarflag VALUE' leaves the new cur arg == "VALUE" diff --git a/ACE/ace/Argv_Type_Converter.h b/ACE/ace/Argv_Type_Converter.h index 205fa10c983..6d01c05faee 100644 --- a/ACE/ace/Argv_Type_Converter.h +++ b/ACE/ace/Argv_Type_Converter.h @@ -29,7 +29,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * * @brief To convert 'char' input/command line parameter to 'wchar_t'. * - * This class is to convert 'char' type command line paramter to + * This class is to convert 'char' type command line parameter to * wide-character (wchar_t) format and stores the copy of it. * This is useful for all classes that use 'char**' argv but cannot * be converted into 'ACE_TCHAR**' version. @@ -54,7 +54,7 @@ public: /// Returns the pointer of ASCII (char) command line. char** get_ASCII_argv (void); - /// Returns the number of sub paramters (argc). + /// Returns the number of sub parameters (argc). int& get_argc (void); private: @@ -83,7 +83,7 @@ private: #endif // ACE_USES_WCHAR private: - /// Original number of input paramter, same as 'argc'. + /// Original number of input parameter, same as 'argc'. int &saved_argc_; /// Data member pointer that contains converted argv in ACE_ANTI_TCHAR. diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index b30d68a56be..21c91b3699b 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -707,94 +707,134 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_INT64_LITERAL(n) n ## ll # endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */ -#if !defined (ACE_INT8_FORMAT_SPECIFIER) +#if !defined (ACE_INT8_FORMAT_SPECIFIER_ASCII) # if defined (PRId8) -# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId8) +# define ACE_INT8_FORMAT_SPECIFIER_ASCII "%" PRId8 # else -# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_INT8_FORMAT_SPECIFIER_ASCII "%d" # endif /* defined (PRId8) */ +#endif /* ACE_INT8_FORMAT_SPECIFIER_ASCII */ + +#if !defined (ACE_INT8_FORMAT_SPECIFIER) +# define ACE_INT8_FORMAT_SPECIFIER ACE_TEXT (ACE_INT8_FORMAT_SPECIFIER) #endif /* ACE_INT8_FORMAT_SPECIFIER */ -#if !defined (ACE_UINT8_FORMAT_SPECIFIER) +#if !defined (ACE_UINT8_FORMAT_SPECIFIER_ASCII) # if defined (PRIu8) -# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu8) +# define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%" PRIu8 # else -# define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_UINT8_FORMAT_SPECIFIER_ASCII "%u" # endif /* defined (PRIu8) */ #endif /* ACE_UINT8_FORMAT_SPECIFIER */ -#if !defined (ACE_INT16_FORMAT_SPECIFIER) +#if !defined (ACE_UINT8_FORMAT_SPECIFIER) +#define ACE_UINT8_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT8_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_UINT8_FORMAT_SPECIFIER */ + +#if !defined (ACE_INT16_FORMAT_SPECIFIER_ASCII) # if defined (PRId16) -# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId16) +# define ACE_INT16_FORMAT_SPECIFIER_ASCII "%" PRId16 # else -# define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_INT16_FORMAT_SPECIFIER_ASCII "%d" # endif /* defined (PRId16) */ #endif /* ACE_INT16_FORMAT_SPECIFIER */ -#if !defined (ACE_UINT16_FORMAT_SPECIFIER) +#if !defined (ACE_INT16_FORMAT_SPECIFIER) +#define ACE_INT16_FORMAT_SPECIFIER ACE_TEXT (ACE_INT16_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_INT16_FORMAT_SPECIFIER */ + +#if !defined (ACE_UINT16_FORMAT_SPECIFIER_ASCII) # if defined (PRIu16) -# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu16) +# define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%" PRIu16 # else -# define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_UINT16_FORMAT_SPECIFIER_ASCII "%u" # endif /* defined (PRIu16) */ #endif /* ACE_UINT16_FORMAT_SPECIFIER */ -#if !defined (ACE_INT32_FORMAT_SPECIFIER) +#if !defined (ACE_UINT16_FORMAT_SPECIFIER) +#define ACE_UINT16_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT16_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_UINT16_FORMAT_SPECIFIER */ + +#if !defined (ACE_INT32_FORMAT_SPECIFIER_ASCII) # if defined (PRId32) -# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId32) +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%" PRId32 # elif ACE_SIZEOF_INT == 4 -# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%d" # else -# define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT ("%ld") +# define ACE_INT32_FORMAT_SPECIFIER_ASCII "%ld" # endif /* defined (PRId32) */ #endif /* ACE_INT32_FORMAT_SPECIFIER */ -#if !defined (ACE_UINT32_FORMAT_SPECIFIER) +#if !defined (ACE_INT32_FORMAT_SPECIFIER) +#define ACE_INT32_FORMAT_SPECIFIER ACE_TEXT (ACE_INT32_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_INT32_FORMAT_SPECIFIER */ + +#if !defined (ACE_UINT32_FORMAT_SPECIFIER_ASCII) # if defined (PRIu32) -# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu32) +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%" PRIu32 # elif ACE_SIZEOF_INT == 4 -# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%u" # else -# define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_UINT32_FORMAT_SPECIFIER_ASCII "%lu" # endif /* defined (PRIu32) */ #endif /* ACE_UINT32_FORMAT_SPECIFIER */ -#if !defined (ACE_INT64_FORMAT_SPECIFIER) +#if !defined (ACE_UINT32_FORMAT_SPECIFIER) +#define ACE_UINT32_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT32_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_UINT32_FORMAT_SPECIFIER */ + +#if !defined (ACE_INT64_FORMAT_SPECIFIER_ASCII) # if defined (PRId64) -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRId64) +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%" PRId64 # elif ACE_SIZEOF_LONG == 8 -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%ld") +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld" # else -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%lld") +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%lld" # endif /* defined (PRId64) */ #endif /* ACE_INT64_FORMAT_SPECIFIER */ -#if !defined (ACE_UINT64_FORMAT_SPECIFIER) +#if !defined (ACE_INT64_FORMAT_SPECIFIER) +#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT (ACE_INT64_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_INT64_FORMAT_SPECIFIER */ + +#if !defined (ACE_UINT64_FORMAT_SPECIFIER_ASCII) # if defined (PRIu64) -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%") ACE_TEXT (PRIu64) +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%" PRIu64 # elif ACE_SIZEOF_LONG == 8 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" # else -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%llu") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%llu" # endif /* defined (PRIu64) */ +#endif /* ACE_UINT64_FORMAT_SPECIFIER_ASCII */ + +#if !defined (ACE_UINT64_FORMAT_SPECIFIER) +#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT (ACE_UINT64_FORMAT_SPECIFIER_ASCII) #endif /* ACE_UINT64_FORMAT_SPECIFIER */ -#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) +#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) # if defined (ACE_WIN64) -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%I64d" # else -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%d") +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%d" # endif /* ACE_WIN64 */ #endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ -#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) +#if !defined (ACE_SSIZE_T_FORMAT_SPECIFIER) +#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ + +#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) # if defined (ACE_WIN64) -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%I64u" # else -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%u") +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%u" # endif /* ACE_WIN64 */ #endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ +#if !defined (ACE_SIZE_T_FORMAT_SPECIFIER) +#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) +#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ + // Cast from UINT64 to a double requires an intermediate cast to INT64 // on some platforms. # if defined (ACE_LACKS_LONGLONG_T) diff --git a/ACE/ace/Cleanup.cpp b/ACE/ace/Cleanup.cpp index d75d0b728a6..fdbd765edea 100644 --- a/ACE/ace/Cleanup.cpp +++ b/ACE/ace/Cleanup.cpp @@ -20,7 +20,6 @@ ACE_Cleanup::cleanup (void *) delete this; } - ACE_Cleanup::~ACE_Cleanup (void) { } @@ -42,6 +41,15 @@ ACE_Cleanup_Info::ACE_Cleanup_Info (void) { } +ACE_Cleanup_Info::ACE_Cleanup_Info (void *object, + ACE_CLEANUP_FUNC cleanup_hook, + void *param) + : object_ (object), + cleanup_hook_ (cleanup_hook), + param_ (param) +{ +} + bool ACE_Cleanup_Info::operator== (const ACE_Cleanup_Info &o) const { @@ -120,7 +128,6 @@ ACE_OS_Exit_Info::ACE_OS_Exit_Info (void) ACE_OS_Exit_Info::~ACE_OS_Exit_Info (void) { delete registered_objects_; - registered_objects_ = 0; } int @@ -128,10 +135,7 @@ ACE_OS_Exit_Info::at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param) { - ACE_Cleanup_Info new_info; - new_info.object_ = object; - new_info.cleanup_hook_ = cleanup_hook; - new_info.param_ = param; + ACE_Cleanup_Info new_info (object, cleanup_hook, param); // Return -1 and sets errno if unable to allocate storage. Enqueue // at the head and dequeue from the head to get LIFO ordering. @@ -147,10 +151,10 @@ ACE_OS_Exit_Info::at_exit_i (void *object, } } -int +bool ACE_OS_Exit_Info::find (void *object) { - // Check for already in queue, and return 1 if so. + // Check for already in queue, and return true if so. for (ACE_Cleanup_Info_Node *iter = registered_objects_; iter && iter->next_ != 0; iter = iter->next_) @@ -158,11 +162,11 @@ ACE_OS_Exit_Info::find (void *object) if (iter->cleanup_info_.object_ == object) { // The object has already been registered. - return 1; + return true; } } - return 0; + return false; } void @@ -177,16 +181,27 @@ ACE_OS_Exit_Info::call_hooks (void) ACE_Cleanup_Info &info = iter->cleanup_info_; if (info.cleanup_hook_ == reinterpret_cast<ACE_CLEANUP_FUNC> ( ACE_CLEANUP_DESTROYER_NAME)) - // The object is an ACE_Cleanup. - ACE_CLEANUP_DESTROYER_NAME ( - reinterpret_cast<ACE_Cleanup *> (info.object_), - info.param_); + { + // The object is an ACE_Cleanup. + ACE_CLEANUP_DESTROYER_NAME ( + reinterpret_cast<ACE_Cleanup *> (info.object_), + info.param_); + } else if (info.object_ == &ace_exit_hook_marker) - // The hook is an ACE_EXIT_HOOK. - (* reinterpret_cast<ACE_EXIT_HOOK> (info.cleanup_hook_)) (); + { + // The hook is an ACE_EXIT_HOOK. + (* reinterpret_cast<ACE_EXIT_HOOK> (info.cleanup_hook_)) (); + } else - (*info.cleanup_hook_) (info.object_, info.param_); + { + (*info.cleanup_hook_) (info.object_, info.param_); + } } + + // Delete now the list of cleanup hooks, all are called and we don't want + // to call them again + delete registered_objects_; + registered_objects_ = 0; } ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h index 7acff23ab79..e3e55f4596a 100644 --- a/ACE/ace/Cleanup.h +++ b/ACE/ace/Cleanup.h @@ -66,9 +66,14 @@ void ACE_CLEANUP_DESTROYER_NAME (ACE_Cleanup *, void *param = 0); class ACE_Export ACE_Cleanup_Info { public: - /// Default constructor. + /// Constructor ACE_Cleanup_Info (void); + /// Constructor. + ACE_Cleanup_Info (void *object, + ACE_CLEANUP_FUNC cleanup_hook, + void *param); + /// Equality operator. bool operator== (const ACE_Cleanup_Info &o) const; @@ -92,6 +97,8 @@ class ACE_Cleanup_Info_Node; * * @brief Hold Object Manager cleanup (exit) information. * + * @internal + * * For internal use by the ACE library, only. */ class ACE_Export ACE_OS_Exit_Info @@ -106,9 +113,9 @@ public: /// Use to register a cleanup hook. int at_exit_i (void *object, ACE_CLEANUP_FUNC cleanup_hook, void *param); - /// Look for a registered cleanup hook object. Returns 1 if already - /// registered, 0 if not. - int find (void *object); + /// Look for a registered cleanup hook object. Returns true if already + /// registered, false if not. + bool find (void *object); /// Call all registered cleanup hooks, in reverse order of /// registration. diff --git a/ACE/ace/DLL_Manager.cpp b/ACE/ace/DLL_Manager.cpp index c0ebf7d4dee..276646b6abb 100644 --- a/ACE/ace/DLL_Manager.cpp +++ b/ACE/ace/DLL_Manager.cpp @@ -446,7 +446,7 @@ ACE_DLL_Handle::get_dll_names (const ACE_TCHAR *dll_name, for (size_t i = 0; i < 5 && try_names.size () < try_names.max_size (); ++i) { ACE_TString try_this; - size_t j = try_names.size (); + size_t const j = try_names.size (); switch (i) { case 0: // Name + decorator + suffix diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index 71c97bcf4a8..ff91cd4480d 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -37,7 +37,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * inheritance hierarchy but also would like to integrate with * the ACE_Reactor. Rather than adopt a "mixin" approach, it is * often cleaner to define a template as a subclass of - * ACE_Event_Handler and paramterize it with an operation + * ACE_Event_Handler and parameterize it with an operation * dispatcher type. * When constructing an instantiation of the ACE_Event_Handler_T * object, a set of pointers to member functions must be diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index 8a18401b84e..3afaa862f37 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -213,6 +213,7 @@ libACE_la_SOURCES = \ OS_NS_time.cpp \ OS_NS_unistd.cpp \ OS_NS_wchar.cpp \ + OS_NS_wctype.cpp \ OS_QoS.cpp \ OS_TLI.cpp \ OS_Thread_Adapter.cpp \ @@ -808,6 +809,8 @@ nobase_include_HEADERS += \ OS_NS_unistd.h \ OS_NS_unistd.inl \ OS_NS_wchar.h \ + OS_NS_wctype.h \ + OS_NS_wctype.inl \ OS_NS_wchar.inl \ OS_QoS.h \ OS_String.h \ diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index 2827a162b93..03feaa24f59 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -46,20 +46,19 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_Errno_Guard { public: - /// Stash the value of <error> into <error_> and initialize the - /// <errno_ptr_> to the address of <errno_ref>. + /// Stash the value of @a error into @c error_ and initialize the + /// @c errno_ptr_ to the address of @a errno_ref. ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref, int error); - /// Stash the value of @c errno into <error_> and initialize the - /// <errno_ptr_> to the address of <errno_ref>. + /// Initialize the @c errno_ptr_ to the address of @a errno_ref. ACE_Errno_Guard (ACE_ERRNO_TYPE &errno_ref); /// Reset the value of @c errno to <error>. ~ACE_Errno_Guard (void); #if defined (ACE_HAS_WINCE_BROKEN_ERRNO) - /// Assign <errno_ref> to <error_>. + /// Assign @a errno_ref to <error_>. int operator= (const ACE_ERRNO_TYPE &errno_ref); #endif /* ACE_HAS_WINCE_BROKEN_ERRNO */ diff --git a/ACE/ace/OS_NS_ctype.h b/ACE/ace/OS_NS_ctype.h index 38adbb461c2..dc36987038c 100644 --- a/ACE/ace/OS_NS_ctype.h +++ b/ACE/ace/OS_NS_ctype.h @@ -128,12 +128,6 @@ namespace ACE_OS { /// Tests @a c for the property specified by the @a desc argument ACE_NAMESPACE_INLINE_FUNCTION int ace_isctype (int c, ctype_t desc); - -#if defined (ACE_HAS_WCHAR) - /// Tests @a c for the property specified by the @a desc argument - ACE_NAMESPACE_INLINE_FUNCTION - int ace_iswctype(wint_t c, wctype_t desc); -#endif /* ACE_HAS_WCHAR */ //@} } /* namespace ACE_OS */ diff --git a/ACE/ace/OS_NS_ctype.inl b/ACE/ace/OS_NS_ctype.inl index 8f899b1a209..f649982930e 100644 --- a/ACE/ace/OS_NS_ctype.inl +++ b/ACE/ace/OS_NS_ctype.inl @@ -2,7 +2,7 @@ // // $Id$ -#if defined (ACE_LACKS_ISCTYPE) || defined (ACE_LACKS_ISWCTYPE) +#if defined (ACE_LACKS_ISCTYPE) #include "ace/OS_NS_errno.h" #endif @@ -223,18 +223,4 @@ ACE_OS::ace_isctype(int c, ctype_t desc) #endif } -#if defined (ACE_HAS_WCHAR) -ACE_INLINE int -ACE_OS::ace_iswctype(wint_t c, wctype_t desc) -{ -#if !defined (ACE_LACKS_ISWCTYPE) - return iswctype (c, desc); -#else - ACE_UNUSED_ARG (c); - ACE_UNUSED_ARG (desc); - ACE_NOTSUP_RETURN (-1); -#endif -} -#endif /* ACE_HAS_WCHAR */ - ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index 5edbab0f5f5..762d0c1fbc2 100644 --- a/ACE/ace/OS_NS_stropts.h +++ b/ACE/ace/OS_NS_stropts.h @@ -108,13 +108,13 @@ namespace ACE_OS { ACE_NAMESPACE_INLINE_FUNCTION int fdetach (const char *file); - /// UNIX-style <ioctl>. + /// UNIX-style @c ioctl ACE_NAMESPACE_INLINE_FUNCTION int ioctl (ACE_HANDLE handle, ACE_IOCTL_TYPE_ARG2 cmd, void * = 0); - /// QoS-enabled <ioctl>. + /// QoS-enabled @c ioctl extern ACE_Export int ioctl (ACE_HANDLE socket, unsigned long io_control_code, diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl index 49f2bb579f6..7a9f5471ce8 100644 --- a/ACE/ace/OS_NS_unistd.inl +++ b/ACE/ace/OS_NS_unistd.inl @@ -555,11 +555,10 @@ ACE_OS::hostname (wchar_t name[], size_t maxnamelen) #else /* ACE_WIN32 && !ACE_HAS_WINCE */ // Emulate using the char version char *char_name = 0; - int result = 0; ACE_NEW_RETURN (char_name, char[maxnamelen], -1); - result = ACE_OS::hostname(char_name, maxnamelen); + int result = ACE_OS::hostname(char_name, maxnamelen); ACE_OS::strcpy (name, ACE_Ascii_To_Wide (char_name).wchar_rep ()); delete [] char_name; diff --git a/ACE/ace/OS_NS_wctype.cpp b/ACE/ace/OS_NS_wctype.cpp new file mode 100644 index 00000000000..4a25bfd79e3 --- /dev/null +++ b/ACE/ace/OS_NS_wctype.cpp @@ -0,0 +1,11 @@ +// -*- C++ -*- +// $Id$ + +#include "ace/OS_NS_wctype.h" + +ACE_RCSID(ace, OS_NS_wctype, "$Id$") + +#if !defined (ACE_HAS_INLINED_OSCALLS) +# include "ace/OS_NS_wctype.inl" +#endif /* ACE_HAS_INLINED_OSCALLS */ + diff --git a/ACE/ace/OS_NS_wctype.h b/ACE/ace/OS_NS_wctype.h new file mode 100644 index 00000000000..58b740001a4 --- /dev/null +++ b/ACE/ace/OS_NS_wctype.h @@ -0,0 +1,71 @@ +// -*- C++ -*- + +//============================================================================= +/** + * @file OS_NS_wctype.h + * + * $Id$ + * + * @author Johnny Willemsen <jwillemsen@remedy.nl> + */ +//============================================================================= + +#ifndef ACE_OS_NS_WCTYPE_H +# define ACE_OS_NS_WCTYPE_H + +# include /**/ "ace/pre.h" + +# include "ace/config-all.h" + +# if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +# endif /* ACE_LACKS_PRAGMA_ONCE */ + +#include /**/ "ace/ACE_export.h" + +#if defined (ACE_EXPORT_MACRO) +# undef ACE_EXPORT_MACRO +#endif +#define ACE_EXPORT_MACRO ACE_Export + +#include "ace/os_include/os_ctype.h" +#if defined ACE_HAS_WCHAR +# include "ace/os_include/os_wctype.h" +#endif /* ACE_HAS_WCHAR */ + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +namespace ACE_OS { + + // these are non-standard names... + + /** @name Functions from <cctype> + * + * Included are the functions defined in <cctype> and their <cwctype> + * equivalents. + * + * Since they are often implemented as macros, we don't use the same name + * here. Instead, we change by prepending "ace_". + */ + //@{ +#if defined (ACE_HAS_WCHAR) + /// Tests @a c for the property specified by the @a desc argument + ACE_NAMESPACE_INLINE_FUNCTION + int ace_iswctype(wint_t c, wctype_t desc); +#endif /* ACE_HAS_WCHAR */ + //@} + +} /* namespace ACE_OS */ + +ACE_END_VERSIONED_NAMESPACE_DECL + +# if defined (ACE_HAS_INLINED_OSCALLS) +# if defined (ACE_INLINE) +# undef ACE_INLINE +# endif /* ACE_INLINE */ +# define ACE_INLINE inline +# include "ace/OS_NS_wctype.inl" +# endif /* ACE_HAS_INLINED_OSCALLS */ + +# include /**/ "ace/post.h" +#endif /* ACE_OS_NS_WCTYPE_H */ diff --git a/ACE/ace/OS_NS_wctype.inl b/ACE/ace/OS_NS_wctype.inl new file mode 100644 index 00000000000..9fc6321e64a --- /dev/null +++ b/ACE/ace/OS_NS_wctype.inl @@ -0,0 +1,25 @@ +// -*- C++ -*- +// +// $Id$ + +#if defined (ACE_LACKS_ISWCTYPE) +#include "ace/OS_NS_errno.h" +#endif + +ACE_BEGIN_VERSIONED_NAMESPACE_DECL + +#if defined (ACE_HAS_WCHAR) +ACE_INLINE int +ACE_OS::ace_iswctype(wint_t c, wctype_t desc) +{ +#if !defined (ACE_LACKS_ISWCTYPE) + return iswctype (c, desc); +#else + ACE_UNUSED_ARG (c); + ACE_UNUSED_ARG (desc); + ACE_NOTSUP_RETURN (-1); +#endif +} +#endif /* ACE_HAS_WCHAR */ + +ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index ea70011cedf..0d737ef7e34 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -97,8 +97,7 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, } // Enable non-blocking, if required. - if (timeout != 0 - && new_stream.enable (ACE_NONBLOCK) == -1) + if (timeout != 0 && new_stream.enable (ACE_NONBLOCK) == -1) return -1; else return 0; @@ -163,10 +162,18 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, // EISCONN is treated specially since this routine may be used to // check if we are already connected. if (result != -1 || error == EISCONN) - // Start out with non-blocking disabled on the <new_stream>. - new_stream.disable (ACE_NONBLOCK); + { + // Start out with non-blocking disabled on the new_stream. + result = new_stream.disable (ACE_NONBLOCK); + if (result == -1) + { + new_stream.close (); + } + } else if (!(error == EWOULDBLOCK || error == ETIMEDOUT)) - new_stream.close (); + { + new_stream.close (); + } return result; } diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h index a7e668b4be0..48f1610ad20 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.h +++ b/ACE/ace/SOCK_Dgram_Mcast.h @@ -201,7 +201,7 @@ public: /** * This method is optional; if not explicitly invoked, it is invoked by * the first <subscribe>, using the subscribed address/port# and network - * interface paramters. + * interface parameters. * The <mcast_addr> parameter defines the default send address/port# and * also the port# and, if the OPT_BINDADDR_YES option is used, * the multicast address that is bound to this socket. diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index 1d7067fa204..322b79b709b 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -354,7 +354,7 @@ private: /// Cache the mode so we can answer fast int mode_; - /// The private key, certificate, and Diffie-Hellman paramters files + /// The private key, certificate, and Diffie-Hellman parameters files ACE_SSL_Data_File private_key_; ACE_SSL_Data_File certificate_; ACE_SSL_Data_File dh_params_; diff --git a/ACE/ace/Sample_History.cpp b/ACE/ace/Sample_History.cpp index 9bd2ca47852..0cff6a7d624 100644 --- a/ACE/ace/Sample_History.cpp +++ b/ACE/ace/Sample_History.cpp @@ -46,7 +46,7 @@ ACE_Sample_History::dump_samples (const ACE_TCHAR *msg, #ifndef ACE_NLOGGING for (size_t i = 0; i != this->sample_count_; ++i) { - const ACE_UINT64 val = this->samples_[i] / scale_factor; + ACE_UINT64 const val = this->samples_[i] / scale_factor; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%s: ") ACE_SIZE_T_FORMAT_SPECIFIER diff --git a/ACE/ace/Service_Repository.cpp b/ACE/ace/Service_Repository.cpp index 4d1d79bd11c..b0c65b6516b 100644 --- a/ACE/ace/Service_Repository.cpp +++ b/ACE/ace/Service_Repository.cpp @@ -198,7 +198,7 @@ ACE_Service_Repository::close (void) #ifndef ACE_NLOGGING if(ACE::debug ()) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) SR::close - repo=%@, size=%d\n"), + ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@, size=%d\n"), this, this->current_size_)); #endif @@ -216,12 +216,12 @@ ACE_Service_Repository::close (void) { if (s == 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d] -> 0\n"), + ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d] -> 0\n"), this, i)); else ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"), + ACE_TEXT ("ACE (%P|%t) SR::close - repo=%@ [%d], name=%s, object=%@\n"), this, i, s->name (), @@ -244,7 +244,7 @@ ACE_Service_Repository::~ACE_Service_Repository (void) ACE_TRACE ("ACE_Service_Repository::~ACE_Service_Repository"); #ifndef ACE_NLOGGING if(ACE::debug ()) - ACE_DEBUG ((LM_DEBUG, "(%P|%t) SR::<dtor>, this=%@\n", this)); + ACE_DEBUG ((LM_DEBUG, "ACE (%P|%t) SR::<dtor>, this=%@\n", this)); #endif this->close (); } diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp index 2e3682bcb2e..12524229836 100644 --- a/ACE/ace/Sock_Connect.cpp +++ b/ACE/ace/Sock_Connect.cpp @@ -57,14 +57,16 @@ const struct in6_addr in6addr_linklocal_allnodes = IN6ADDR_LINKLOCAL_ALLNODES_IN const struct in6_addr in6addr_linklocal_allrouters = IN6ADDR_LINKLOCAL_ALLROUTERS_INIT; #endif /* ACE_VXWORKS == 0x630 && __RTP__ && ACE_HAS_IPV6 */ -#if defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_IPV6) && defined (ACE_HAS_WINCE) #include /**/ <Iphlpapi.h> +# if defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) // The following code is suggested by microsoft as a workaround to the fact // that on Windows CE, these constants are exported as function addresses // rather than simply values. # include /**/ <ws2tcpip.h> const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; +# endif #endif // ACE_HAS_WINCE #if defined (ACE_WIN32) && defined (ACE_HAS_PHARLAP) @@ -491,7 +493,7 @@ static int get_ip_interfaces_win32 (size_t &count, ACE_INET_Addr *&addrs) { -# if defined (ACE_HAS_WINCE) +# if defined (ACE_HAS_WINCE) && defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0) // moved the ACE_HAS_WINCE impl ahaid of ACE_HAS_WINSOCK2 because // WINCE in fact has winsock2, but doesn't properly support the // WSAIoctl for obtaining IPv6 address info. @@ -603,7 +605,7 @@ get_ip_interfaces_win32 (size_t &count, // kernel says there are no more of that type. const size_t ACE_MAX_ETS_DEVICES = 64; // Arbitrary, but should be enough. DEVHANDLE ip_dev[ACE_MAX_ETS_DEVICES]; - EK_TCPIPCFG *devp; + EK_TCPIPCFG *devp = 0; size_t i, j; ACE_TCHAR dev_name[16]; diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 40dabf2eb3d..4a643b6494d 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -176,6 +176,7 @@ project(ACE) : acedefaults, install, other, codecs, token, svcconf, uuid, fileca OS_NS_time.cpp OS_NS_unistd.cpp OS_NS_wchar.cpp + OS_NS_wctype.cpp OS_QoS.cpp OS_Thread_Adapter.cpp OS_TLI.cpp diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index f1dd97b5715..707532e3e4f 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -135,6 +135,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, OS_NS_time.cpp OS_NS_unistd.cpp OS_NS_wchar.cpp + OS_NS_wctype.cpp OS_QoS.cpp OS_Thread_Adapter.cpp OS_TLI.cpp diff --git a/ACE/ace/config-cray.h b/ACE/ace/config-cray.h index 4a10f013664..94b28a25c16 100644 --- a/ACE/ace/config-cray.h +++ b/ACE/ace/config-cray.h @@ -203,7 +203,6 @@ /* #define ACE_HAS_TLI */ /* #define ACE_HAS_TIUSER_H */ /* #define ACE_HAS_TLI_PROTOTYPES */ -/* #define ACE_LACKS_T_ERRNO */ /* #define ACE_LACKS_NAMED_POSIX_SEM */ diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 17f802d85c1..69acd81901b 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -373,9 +373,9 @@ #if defined (__ia64) || defined(__alpha) || defined (__x86_64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%lu") -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #endif /* __ia64 */ #define ACE_SIZEOF_WCHAR 4 diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index e06ae2a1182..a8678fd6490 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -32,7 +32,7 @@ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) # if defined (ACE_HAS_PENTIUM) @@ -54,7 +54,7 @@ #define ACE_LACKS_STROPTS_H // Platform provides <execinfo.h> header. -#define ACE_HAS_EXECINFO_H +#define ACE_HAS_EXECINFO_H // Wcharness.... #define ACE_HAS_WCHAR diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h index 1c7361fd416..b6bc04449c8 100644 --- a/ACE/ace/config-macosx-panther.h +++ b/ACE/ace/config-macosx-panther.h @@ -15,7 +15,7 @@ #endif /* __GNUG__ */ #define ACE_LACKS_SUSECONDS_T -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index ffbac895798..60049cb3b79 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -26,7 +26,7 @@ #define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) # if defined (ACE_HAS_PENTIUM) diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h index c721353ca48..513a2d3d890 100644 --- a/ACE/ace/config-macosx.h +++ b/ACE/ace/config-macosx.h @@ -14,7 +14,7 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 1923a3602f0..999b66ce5e5 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -141,8 +141,8 @@ typedef unsigned long ACE_UINT64; typedef signed long ACE_INT64; -#define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%ld") -#define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%lu") +#define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" +#define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #elif defined(__i386__) diff --git a/ACE/ace/config-sco-5.0.0.h b/ACE/ace/config-sco-5.0.0.h index 519b74a2ead..d5fd5783e09 100644 --- a/ACE/ace/config-sco-5.0.0.h +++ b/ACE/ace/config-sco-5.0.0.h @@ -48,9 +48,6 @@ // Compiler/platform has correctly prototyped header files. #define ACE_HAS_CPLUSPLUS_HEADERS -// Header files lack t_errno for ACE_TLI. -//#define ACE_LACKS_T_ERRNO - // Compiler/platform supports poll(). // #define ACE_HAS_POLL diff --git a/ACE/ace/config-sunos5.10.h b/ACE/ace/config-sunos5.10.h index bca0f7000ac..ca5b979495b 100644 --- a/ACE/ace/config-sunos5.10.h +++ b/ACE/ace/config-sunos5.10.h @@ -38,15 +38,15 @@ #endif // Solaris 10 introduced printf() modifiers for [s]size_t types. -#if defined (ACE_SSIZE_T_FORMAT_SPECIFIER) -# undef ACE_SSIZE_T_FORMAT_SPECIFIER -# define ACE_SSIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zd") -#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER */ +#if defined (ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII) +# undef ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII +# define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%zd" +#endif /* ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII */ -#if defined (ACE_SIZE_T_FORMAT_SPECIFIER) -# undef ACE_SIZE_T_FORMAT_SPECIFIER -# define ACE_SIZE_T_FORMAT_SPECIFIER ACE_TEXT ("%zu") -#endif /* ACE_SIZE_T_FORMAT_SPECIFIER */ +#if defined (ACE_SIZE_T_FORMAT_SPECIFIER_ASCII) +# undef ACE_SIZE_T_FORMAT_SPECIFIER_ASCII +# define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%zu" +#endif /* ACE_SIZE_T_FORMAT_SPECIFIER_ASCII */ // Solaris 10 offers wcstoll() and wcstoull() #if defined (ACE_LACKS_WCSTOLL) diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index 9c302e3c21a..2df876b180b 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -231,8 +231,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Ld" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" //========================================================================= // Threads specific parts diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index a70c0016a34..55e119605e5 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -232,8 +232,8 @@ typedef enum CMA_T_SCHED_POLICY { #define ACE_HRTIME_T_IS_BASIC_TYPE // printf format specifiers for 64 bit integers -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Ld" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" // Use larger default buffer size for ease of interoperability #define ACE_DEFAULT_CDR_BUFSIZE 4096 diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 6f69fd498f7..3e93b6714dc 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -124,8 +124,8 @@ # define ACE_HAS_NEW_NOTHROW # define ACE_TEMPLATES_REQUIRE_SOURCE 1 # define ACE_SIZEOF_LONG_DOUBLE 10 -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%Lu") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%Ld") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%Lu" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%Ld" # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h index 95bf474852e..2467d4845c4 100644 --- a/ACE/ace/config-win32-ghs.h +++ b/ACE/ace/config-win32-ghs.h @@ -74,9 +74,8 @@ //# define ACE_NEW_THROWS_EXCEPTIONS 1 # define ACE_SIZEOF_LONG_DOUBLE 10 # define ACE_TEMPLATES_REQUIRE_SOURCE 1 -// Changed ACE_TEXT to ACE_TEXT in the following two lines -# define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") -# define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") +# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" +# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 // Set the following to zero to placate SString.h ACE_WString CTOR # undef ACE_WSTRING_HAS_USHORT_SUPPORT diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index f5dad2c17c0..afb1e1233e5 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -93,8 +93,8 @@ # define ACE_HAS_PENTIUM #endif -#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h index 1fbca6fb1ef..b91e241530d 100644 --- a/ACE/ace/config-win32-msvc-10.h +++ b/ACE/ace/config-win32-msvc-10.h @@ -56,10 +56,10 @@ # define ACE_HAS_EXCEPTIONS #endif -// Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501) +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 5.0 or less */ +# endif /* !Win CE 6.0 or less */ #define ACE_HAS_STRERROR #define ACE_LACKS_STRPTIME diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h index 3b49d04d192..65b817482d6 100644 --- a/ACE/ace/config-win32-msvc-9.h +++ b/ACE/ace/config-win32-msvc-9.h @@ -56,10 +56,10 @@ # define ACE_HAS_EXCEPTIONS #endif -// Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501) +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 5.0 or less */ +# endif /* !Win CE 6.0 or less */ #define ACE_HAS_STRERROR #define ACE_LACKS_STRPTIME diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 1b1dab3a4a8..66f5f015434 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -120,8 +120,8 @@ #define ACE_LACKS_TERMIOS_H #define ACE_LACKS_REGEX_H -#define ACE_INT64_FORMAT_SPECIFIER ACE_TEXT ("%I64d") -#define ACE_UINT64_FORMAT_SPECIFIER ACE_TEXT ("%I64u") +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" #define ACE_STRTOLL_EQUIVALENT ::_strtoi64 #define ACE_WCSTOLL_EQUIVALENT ::_wcstoi64 diff --git a/ACE/ace/os_include/os_errno.h b/ACE/ace/os_include/os_errno.h index 6d2656dba16..eb51405c576 100644 --- a/ACE/ace/os_include/os_errno.h +++ b/ACE/ace/os_include/os_errno.h @@ -92,9 +92,9 @@ extern "C" void herror (const char *str); #endif /* ACE_HAS_H_ERRNO */ -#if !defined (ACE_WIN32) && defined (ACE_LACKS_T_ERRNO) +#if defined (ACE_LACKS_T_ERRNO) extern int t_errno; -#endif /* ACE_WIN32 && ACE_LACKS_T_ERRNO */ +#endif /* ACE_LACKS_T_ERRNO */ #if !defined (ENOSYS) # define ENOSYS EFAULT /* Operation not supported or unknown error. */ |