summaryrefslogtreecommitdiff
path: root/ACE/ace
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/ace')
-rw-r--r--ACE/ace/ACE.cpp12
-rw-r--r--ACE/ace/Asynch_IO.h8
-rw-r--r--ACE/ace/Compression/ACE_Compression.rc30
-rw-r--r--ACE/ace/Compression/rle/ACE_RLECompression.rc30
-rw-r--r--ACE/ace/ETCL/ACE_ETCL.rc30
-rw-r--r--ACE/ace/INET_Addr.cpp12
-rw-r--r--ACE/ace/Intrusive_Auto_Ptr.h2
-rw-r--r--ACE/ace/Log_Msg.cpp45
-rw-r--r--ACE/ace/Log_Record.cpp27
-rw-r--r--ACE/ace/Monitor_Control/Monitor_Control.rc30
-rw-r--r--ACE/ace/Null_Barrier.h6
-rw-r--r--ACE/ace/Null_Condition.h2
-rw-r--r--ACE/ace/OS_NS_time.cpp6
-rw-r--r--ACE/ace/Pipe.cpp10
-rw-r--r--ACE/ace/Process.cpp17
-rw-r--r--ACE/ace/Process.h12
-rw-r--r--ACE/ace/Process.inl8
-rw-r--r--ACE/ace/QoS/ACE_QoS.rc30
-rw-r--r--ACE/ace/SSL/ACE_SSL.rc30
-rw-r--r--ACE/ace/TSS_T.h4
-rw-r--r--ACE/ace/ace_wchar.h6
-rw-r--r--ACE/ace/config-g++-common.h22
22 files changed, 255 insertions, 124 deletions
diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 0ff5080d688..a4379dec41e 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -2343,11 +2343,7 @@ ACE::format_hexdump (const char *buffer,
textver[j] = 0;
ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start),
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_TEXT (" %ls\n"),
-#else
- ACE_TEXT (" %s\n"),
-#endif
+ ACE_TEXT (" %") ACE_TEXT_PRIs ACE_TEXT ("\n"),
textver);
while (*obuf != '\0')
@@ -2384,11 +2380,7 @@ ACE::format_hexdump (const char *buffer,
textver[i] = 0;
ACE_OS::snprintf (obuf, obuf_sz - (obuf - obuf_start),
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_TEXT (" %ls\n"),
-#else
- ACE_TEXT (" %s\n"),
-#endif
+ ACE_TEXT (" %") ACE_TEXT_PRIs ACE_TEXT ("\n"),
textver);
}
return size;
diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h
index 78db98fcdd0..60cc3f17276 100644
--- a/ACE/ace/Asynch_IO.h
+++ b/ACE/ace/Asynch_IO.h
@@ -840,7 +840,7 @@ public:
private:
/// Here just to provide an dummpy implementation, since the
/// one auto generated by MSVC is flagged as infinitely recursive
- void operator= (Result &) {};
+ void operator= (Result &) {}
};
private:
ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Asynch_Write_File &))
@@ -1651,9 +1651,9 @@ public:
class ACE_Export Proxy
{
public:
- Proxy (ACE_Handler *handler) : handler_ (handler) {};
- void reset (void) { this->handler_ = 0; };
- ACE_Handler *handler (void) { return this->handler_; };
+ Proxy (ACE_Handler *handler) : handler_ (handler) {}
+ void reset (void) { this->handler_ = 0; }
+ ACE_Handler *handler (void) { return this->handler_; }
private:
ACE_Handler *handler_;
};
diff --git a/ACE/ace/Compression/ACE_Compression.rc b/ACE/ace/Compression/ACE_Compression.rc
new file mode 100644
index 00000000000..54d61b2b83f
--- /dev/null
+++ b/ACE/ace/Compression/ACE_Compression.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_Compression\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_CompressionDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_Compression.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/Compression/rle/ACE_RLECompression.rc b/ACE/ace/Compression/rle/ACE_RLECompression.rc
new file mode 100644
index 00000000000..9dba63f19dc
--- /dev/null
+++ b/ACE/ace/Compression/rle/ACE_RLECompression.rc
@@ -0,0 +1,30 @@
+#include "../../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_RLECompression\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_RLECompressionDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_RLECompression.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/ETCL/ACE_ETCL.rc b/ACE/ace/ETCL/ACE_ETCL.rc
new file mode 100644
index 00000000000..ec78ac7aeef
--- /dev/null
+++ b/ACE/ace/ETCL/ACE_ETCL.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_ETCL\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_ETCLDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_ETCL.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 70eedf9f954..d5cc97cfc81 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -50,20 +50,12 @@ ACE_INET_Addr::addr_to_string (ACE_TCHAR s[],
+ 5 // ACE_OS::strlen ("65535"), Assuming the max port number.
+ 1 // sizeof (':'), addr/port sep
+ 1; // sizeof ('\0'), terminating NUL
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_TCHAR const *format = ACE_TEXT("%ls:%d");
-#else
- ACE_TCHAR const *format = ACE_TEXT("%s:%d");
-#endif /* !ACE_WIN32 && ACE_USES_WCHAR */
+ ACE_TCHAR const *format = ACE_TEXT("%") ACE_TEXT_PRIs ACE_TEXT(":%d");
#if defined (ACE_HAS_IPV6)
if (ACE_OS::strchr (hoststr, ACE_TEXT (':')) != 0)
{
total_len += 2; // ACE_OS::strlen ("[]") IPv6 addr frames
-# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- format = ACE_TEXT("[%ls]:%d");
-# else
- format = ACE_TEXT("[%s]:%d");
-# endif /* !ACE_WIN32 && ACE_USES_WCHAR */
+ format = ACE_TEXT("[%") ACE_TEXT_PRIs ACE_TEXT("]:%d");
}
#endif // ACE_HAS_IPV6
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 36ff94901b8..c7425bf4e81 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -48,7 +48,7 @@ class ACE_Intrusive_Auto_Ptr
{
protected:
/// Used to define a proper boolean conversion for "if (sp) ..."
- static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){};
+ static void unspecified_bool(ACE_Intrusive_Auto_Ptr<X>***){}
typedef void (*unspecified_bool_type)(ACE_Intrusive_Auto_Ptr<X>***);
public:
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index dbf09f5d3da..2490004c2f4 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1241,11 +1241,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
break;
case 'N': // Source file name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf (bp, bspace, format,
this->file () ?
@@ -1260,11 +1256,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
break;
case 'n': // Program name
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf (bp, bspace, format,
ACE_Log_Msg::program_name_ ?
@@ -1504,11 +1496,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
{
// Nope, print out standard priority_name() string
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf
(bp, bspace, format,
@@ -1538,11 +1526,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
{
#endif
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else /* ACE_WIN32 && ACE_USES_WCHAR */
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf
(bp, bspace, format, ACE_TEXT_CHAR_TO_TCHAR (msg));
@@ -1722,11 +1706,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
sizeof (day_and_time) / sizeof (ACE_TCHAR),
true);
}
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf
(bp, bspace, format, day_and_time);
@@ -1740,11 +1720,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
// hour:minute:sec.usec format.
{
ACE_TCHAR day_and_time[27];
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
-#else
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
-#endif
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
// Did we find the flag indicating a time value argument
if (format[1] == ACE_TEXT('#'))
{
@@ -1819,11 +1795,10 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
{
#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
wchar_t *str = va_arg (argp, wchar_t *);
- ACE_OS::strcpy (fp, ACE_TEXT ("ls"));
#else /* ACE_WIN32 && ACE_USES_WCHAR */
ACE_TCHAR *str = va_arg (argp, ACE_TCHAR *);
- ACE_OS::strcpy (fp, ACE_TEXT ("s"));
#endif /* ACE_WIN32 && ACE_USES_WCHAR */
+ ACE_OS::strcpy (fp, ACE_TEXT_PRIs);
if (can_check)
this_len = ACE_OS::snprintf
(bp, bspace, format, str ? str : ACE_TEXT ("(null)"));
@@ -2977,11 +2952,7 @@ ACE_Log_Msg::log_hexdump (ACE_Log_Priority log_priority,
if (text)
wr_ptr += ACE_OS::snprintf (wr_ptr,
end_ptr - wr_ptr,
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- ACE_TEXT ("%ls - "),
-#else
- ACE_TEXT ("%s - "),
-#endif
+ ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT (" - "),
text);
wr_ptr += ACE_OS::snprintf (wr_ptr,
diff --git a/ACE/ace/Log_Record.cpp b/ACE/ace/Log_Record.cpp
index 68c4ef78a1d..603101a154d 100644
--- a/ACE/ace/Log_Record.cpp
+++ b/ACE/ace/Log_Record.cpp
@@ -235,16 +235,6 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
/* yyyy-mm-dd hh:mm:ss.mmmmmm<nul> */
ACE_TCHAR timestamp[27]; // Only used by VERBOSE and VERBOSE_LITE.
- // The sprintf format needs to be different for Windows and POSIX
- // in the wide-char case.
-#if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR)
- const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%s@%s@%u@%s@%s");
- const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%s@%s@%s");
-#else
- const ACE_TCHAR *verbose_fmt = ACE_TEXT ("%ls@%ls@%u@%ls@%ls");
- const ACE_TCHAR *verbose_lite_fmt = ACE_TEXT ("%ls@%ls@%ls");
-#endif
-
if (ACE_BIT_ENABLED (verbose_flag,
ACE_Log_Msg::VERBOSE)
|| ACE_BIT_ENABLED (verbose_flag,
@@ -269,7 +259,10 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
? ACE_TEXT ("<local_host>")
: host_name);
ACE_OS::snprintf (verbose_msg, verbose_msg_size,
- verbose_fmt,
+ ACE_TEXT ("%") ACE_TEXT_PRIs
+ ACE_TEXT ("@%") ACE_TEXT_PRIs
+ ACE_TEXT ("@%u@%") ACE_TEXT_PRIs
+ ACE_TEXT ("@%") ACE_TEXT_PRIs,
timestamp,
lhost_name,
this->pid_,
@@ -278,7 +271,9 @@ ACE_Log_Record::format_msg (const ACE_TCHAR host_name[],
}
else if (ACE_BIT_ENABLED (verbose_flag, ACE_Log_Msg::VERBOSE_LITE))
ACE_OS::snprintf (verbose_msg, verbose_msg_size,
- verbose_lite_fmt,
+ ACE_TEXT ("%") ACE_TEXT_PRIs
+ ACE_TEXT ("@%") ACE_TEXT_PRIs
+ ACE_TEXT ("@%") ACE_TEXT_PRIs,
timestamp,
ACE_Log_Record::priority_name (ACE_Log_Priority (this->type_)),
this->msg_data_);
@@ -318,15 +313,9 @@ ACE_Log_Record::print (const ACE_TCHAR host_name[],
{
int const verbose_msg_len =
static_cast<int> (ACE_OS::strlen (verbose_msg));
-#if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- int const fwrite_result = ACE_OS::fprintf (fp,
- ACE_TEXT ("%ls"),
- verbose_msg);
-#else
int const fwrite_result = ACE_OS::fprintf (fp,
- ACE_TEXT ("%s"),
+ ACE_TEXT ("%") ACE_TEXT_PRIs,
verbose_msg);
-#endif
// We should have written everything
if (fwrite_result != verbose_msg_len)
result = -1;
diff --git a/ACE/ace/Monitor_Control/Monitor_Control.rc b/ACE/ace/Monitor_Control/Monitor_Control.rc
new file mode 100644
index 00000000000..118f0457042
--- /dev/null
+++ b/ACE/ace/Monitor_Control/Monitor_Control.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_Monitor_Control\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_Monitor_ControlDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_Monitor_Control.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h
index 50e4e2789ea..7be1409dffa 100644
--- a/ACE/ace/Null_Barrier.h
+++ b/ACE/ace/Null_Barrier.h
@@ -27,17 +27,17 @@ public:
/// Initialize the barrier to synchronize <count> threads.
ACE_Null_Barrier (unsigned int,
const char * = 0,
- void * = 0) {};
+ void * = 0) {}
/// Default dtor.
~ACE_Null_Barrier (void) {};
/// Block the caller until all <count> threads have called <wait> and
/// then allow all the caller threads to continue in parallel.
- int wait (void) { return 0; };
+ int wait () { return 0; }
/// Dump the state of an object.
- void dump (void) const {};
+ void dump () const {}
/// Declare the dynamic allocation hooks.
//ACE_ALLOC_HOOK_DECLARE;
diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h
index a86e0c54bec..3e6bd4d2039 100644
--- a/ACE/ace/Null_Condition.h
+++ b/ACE/ace/Null_Condition.h
@@ -66,7 +66,7 @@ public:
/// Returns 0.
int broadcast (void) {return 0;}
- ACE_Null_Mutex &mutex (void) {return this->mutex_;};
+ ACE_Null_Mutex &mutex () {return this->mutex_;}
/// Dump the state of an object.
void dump (void) const {}
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp
index 2ab3c7ebe47..ad8b188d457 100644
--- a/ACE/ace/OS_NS_time.cpp
+++ b/ACE/ace/OS_NS_time.cpp
@@ -253,11 +253,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
FileTimeToSystemTime (&localtime, &systime);
res->tm_hour = systime.wHour;
-
- if(pTz.DaylightBias!=0)
- res->tm_isdst = 1;
- else
- res->tm_isdst = 1;
+ res->tm_isdst = pTz.DaylightBias != 0;
int iLeap;
iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0));
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 7384dcc6332..2f31e82288e 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -98,11 +98,13 @@ ACE_Pipe::open (int buffer_size)
result = -1;
else
{
- ACE_INET_Addr sv_addr (my_addr.get_port_number (),
- ACE_LOCALHOST);
-
+ ACE_INET_Addr sv_addr;
+ if (sv_addr.set (my_addr.get_port_number (), ACE_LOCALHOST) == -1)
+ {
+ result == -1;
+ }
// Establish a connection within the same process.
- if (connector.connect (writer, sv_addr) == -1)
+ else if (connector.connect (writer, sv_addr) == -1)
result = -1;
else if (acceptor.accept (reader) == -1)
{
diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp
index ed29ffd5c5a..a1921102960 100644
--- a/ACE/ace/Process.cpp
+++ b/ACE/ace/Process.cpp
@@ -407,8 +407,8 @@ ACE_Process::spawn (ACE_Process_Options &options)
# endif /* ACE_LACKS_SETPGID */
# if !defined (ACE_LACKS_SETREGID)
- if (options.getrgid () != (uid_t) -1
- || options.getegid () != (uid_t) -1)
+ if (options.getrgid () != (gid_t) -1
+ || options.getegid () != (gid_t) -1)
if (ACE_OS::setregid (options.getrgid (),
options.getegid ()) == -1)
{
@@ -836,8 +836,8 @@ ACE_Process_Options::ACE_Process_Options (bool inherit_environment,
stderr_ (ACE_INVALID_HANDLE),
ruid_ ((uid_t) -1),
euid_ ((uid_t) -1),
- rgid_ ((uid_t) -1),
- egid_ ((uid_t) -1),
+ rgid_ ((gid_t) -1),
+ egid_ ((gid_t) -1),
#endif /* ACE_WIN32 */
handle_inheritance_ (true),
set_handles_called_ (0),
@@ -1041,14 +1041,9 @@ ACE_Process_Options::setenv (const ACE_TCHAR *variable_name,
ACE_NEW_RETURN (newformat, ACE_TCHAR[buflen], -1);
ACE_Auto_Basic_Array_Ptr<ACE_TCHAR> safe_newformat (newformat);
-# if !defined (ACE_WIN32) && defined (ACE_USES_WCHAR)
- const ACE_TCHAR *fmt = ACE_TEXT ("%ls=%ls");
-# else
- const ACE_TCHAR *fmt = ACE_TEXT ("%s=%s");
-# endif
-
// Add in the variable name.
- ACE_OS::snprintf (safe_newformat.get (), buflen, fmt,
+ ACE_OS::snprintf (safe_newformat.get (), buflen,
+ ACE_TEXT ("%") ACE_TEXT_PRIs ACE_TEXT ("=%") ACE_TEXT_PRIs,
variable_name, format);
// Add the rest of the varargs.
diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h
index 1465103ef63..fc6b1af745d 100644
--- a/ACE/ace/Process.h
+++ b/ACE/ace/Process.h
@@ -347,12 +347,12 @@ public:
int setreugid (const ACE_TCHAR* user);
void setruid (uid_t id);
void seteuid (uid_t id);
- void setrgid (uid_t id);
- void setegid (uid_t id);
+ void setrgid (gid_t id);
+ void setegid (gid_t id);
uid_t getruid (void) const;
uid_t geteuid (void) const;
- uid_t getrgid (void) const;
- uid_t getegid (void) const;
+ gid_t getrgid () const;
+ gid_t getegid () const;
/**
* Get the inherit_environment flag.
@@ -418,8 +418,8 @@ protected:
// These should be set to -1 to leave unchanged (default).
uid_t ruid_;
uid_t euid_;
- uid_t rgid_;
- uid_t egid_;
+ gid_t rgid_;
+ gid_t egid_;
#endif /* ACE_WIN32 */
/// Default true.
diff --git a/ACE/ace/Process.inl b/ACE/ace/Process.inl
index 66241f43661..3617c292d83 100644
--- a/ACE/ace/Process.inl
+++ b/ACE/ace/Process.inl
@@ -291,13 +291,13 @@ ACE_Process_Options::seteuid (uid_t id)
}
ACE_INLINE void
-ACE_Process_Options::setrgid (uid_t id)
+ACE_Process_Options::setrgid (gid_t id)
{
this->rgid_ = id;
}
ACE_INLINE void
-ACE_Process_Options::setegid (uid_t id)
+ACE_Process_Options::setegid (gid_t id)
{
this->egid_ = id;
}
@@ -314,13 +314,13 @@ ACE_Process_Options::geteuid (void) const
return this->euid_;
}
-ACE_INLINE uid_t
+ACE_INLINE gid_t
ACE_Process_Options::getrgid (void) const
{
return this->rgid_;
}
-ACE_INLINE uid_t
+ACE_INLINE gid_t
ACE_Process_Options::getegid (void) const
{
return this->egid_;
diff --git a/ACE/ace/QoS/ACE_QoS.rc b/ACE/ace/QoS/ACE_QoS.rc
new file mode 100644
index 00000000000..421855dc8ba
--- /dev/null
+++ b/ACE/ace/QoS/ACE_QoS.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_QoS\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_QoSDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_QoS.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/SSL/ACE_SSL.rc b/ACE/ace/SSL/ACE_SSL.rc
new file mode 100644
index 00000000000..82a7c08eb3b
--- /dev/null
+++ b/ACE/ace/SSL/ACE_SSL.rc
@@ -0,0 +1,30 @@
+#include "../Version.h"
+
+1 VERSIONINFO
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904B0"
+ BEGIN
+ VALUE "FileDescription", "ACE_SSL\0"
+ VALUE "FileVersion", ACE_VERSION "\0"
+ VALUE "InternalName", "ACE_SSLDLL\0"
+ VALUE "LegalCopyright", "\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "ACE_SSL.DLL\0"
+ VALUE "ProductName", "ACE\0"
+ VALUE "ProductVersion", ACE_VERSION "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h
index d3097d54439..203a7ad1ded 100644
--- a/ACE/ace/TSS_T.h
+++ b/ACE/ace/TSS_T.h
@@ -237,11 +237,11 @@ public:
/// TYPE conversion. Inlined here so that it should _always_ be
/// inlined.
- operator TYPE () const { return value_; };
+ operator TYPE () const { return value_; }
/// TYPE & conversion. Inlined here so that it should _always_ be
/// inlined.
- operator TYPE &() { return value_; };
+ operator TYPE &() { return value_; }
private:
/// The wrapped value.
diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h
index 7afc673328b..37197c1c968 100644
--- a/ACE/ace/ace_wchar.h
+++ b/ACE/ace/ace_wchar.h
@@ -94,6 +94,11 @@ typedef char ACE_ANTI_TCHAR;
# define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) STRING
# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep ()
+# if !defined (ACE_WIN32)
+# define ACE_TEXT_PRIs ACE_TEXT("ls")
+# else
+# define ACE_TEXT_PRIs ACE_TEXT("s")
+# endif
#else /* ACE_USES_WCHAR */
typedef char ACE_TCHAR;
typedef wchar_t ACE_ANTI_TCHAR;
@@ -103,6 +108,7 @@ typedef wchar_t ACE_ANTI_TCHAR;
# define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING
# define ACE_TEXT_WCHAR_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
# define ACE_TEXT_ANTI_TO_TCHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep ()
+# define ACE_TEXT_PRIs ACE_TEXT("s")
#endif /* ACE_USES_WCHAR */
// The OS_String module defines some wide-char functions that are not
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index a4c945249e4..219f549a20d 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -31,17 +31,25 @@
# define ACE_HAS_NEW_NOTHROW
#endif /* __GNUC__ >= 3.3 */
-#if __cplusplus >= 201103L
-# define ACE_HAS_CPP11
-#endif
-#if __cplusplus >= 201402L
-# define ACE_HAS_CPP14
+#if __cplusplus >= 202002L
+# define ACE_HAS_CPP20
#endif
#if __cplusplus >= 201703L
# define ACE_HAS_CPP17
+# define ACE_FALLTHROUGH [[fallthrough]]
#endif
-#if __cplusplus >= 202002L
-# define ACE_HAS_CPP20
+#if __cplusplus >= 201402L
+# define ACE_HAS_CPP14
+#endif
+#if __cplusplus >= 201103L
+# define ACE_HAS_CPP11
+# if !defined (ACE_FALLTHROUGH)
+# if __GNUC__ >= 7
+# define ACE_FALLTHROUGH [[gnu::fallthrough]]
+# else
+# define ACE_FALLTHROUGH
+# endif
+# endif
#endif
#if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE)
View Lorry Controller Status