summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ace/INET_Addr.cpp4
-rw-r--r--ACE/ace/Log_Category.inl2
-rw-r--r--ACE/ace/Log_Msg.cpp12
-rw-r--r--ACE/ace/Mutex.cpp1
-rw-r--r--ACE/ace/OS_NS_Thread.cpp2
-rw-r--r--ACE/ace/OS_NS_devctl.h4
-rw-r--r--ACE/ace/Time_Value.cpp4
-rw-r--r--ACE/ace/config-face-safety.h2
-rw-r--r--ACE/bin/PerlACE/TestTarget.pm4
-rw-r--r--ACE/tests/MT_SOCK_Test.cpp2
-rw-r--r--ACE/tests/SOCK_Send_Recv_Test.cpp2
-rw-r--r--ACE/tests/UUID_Test.cpp4
12 files changed, 23 insertions, 20 deletions
diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 7adff1df674..32a9910bd7e 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -1004,8 +1004,8 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const
//}
# if defined (ACE_WIN32)
- sockaddr *sa = reinterpret_cast<sockaddr *>
- (const_cast<sockaddr_in6 *> (&this->inet_addr_.in6_));
+ sockaddr *sa = reinterpret_cast<sockaddr *>
+ (const_cast<sockaddr_in6 *> (&this->inet_addr_.in6_));
if (ACE_OS::getnameinfo (sa, this->get_size (), dst, size,
0, 0, // Don't want service name
NI_NUMERICHOST) == 0)
diff --git a/ACE/ace/Log_Category.inl b/ACE/ace/Log_Category.inl
index 3414a846bbd..42fcf84dc4f 100644
--- a/ACE/ace/Log_Category.inl
+++ b/ACE/ace/Log_Category.inl
@@ -111,8 +111,6 @@ ACE_Log_Category_TSS::log (ACE_Log_Priority priority, const ACE_ANTI_TCHAR *form
#endif /* ACE_HAS_WCHAR */
#else /* ACE_LACKS_VA_FUNCTIONS */
-#include "ace/Log_Record.h"
-
ACE_INLINE ssize_t
ACE_Log_Category_TSS::log (const ACE_Log_Formatter &formatter)
{
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp
index 03bc08fec39..8beec80f503 100644
--- a/ACE/ace/Log_Msg.cpp
+++ b/ACE/ace/Log_Msg.cpp
@@ -1804,10 +1804,16 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str,
ACE_OS::sprintf (bp,
format,
static_cast <unsigned> (ACE_Thread::self ()));
+#elif defined ACE_USES_WCHAR
+ {
+ char tid_buf[32] = {};
+ ACE_OS::thr_id (tid_buf, sizeof tid_buf);
+ this_len = ACE_OS::strlen (tid_buf);
+ ACE_OS::strncpy (bp, ACE_TEXT_CHAR_TO_TCHAR (tid_buf),
+ bspace);
+ }
#else
-
- this_len = ACE_OS::thr_id (bp, bspace);
-
+ this_len = ACE_OS::thr_id (bp, bspace);
#endif /* ACE_WIN32 */
ACE_UPDATE_COUNT (bspace, this_len);
break;
diff --git a/ACE/ace/Mutex.cpp b/ACE/ace/Mutex.cpp
index 574703ebfab..c5e982a5d59 100644
--- a/ACE/ace/Mutex.cpp
+++ b/ACE/ace/Mutex.cpp
@@ -118,7 +118,6 @@ ACE_Mutex::ACE_Mutex (int type, const ACE_TCHAR *name,
ACE_TCHAR *const un =
# ifdef ACE_HAS_ALLOC_HOOKS
(ACE_TCHAR *) ACE_Allocator::instance ()->malloc (un_len);
-
# else
(ACE_TCHAR *) ACE_OS::malloc (un_len);
# endif /* ACE_HAS_ALLOC_HOOKS */
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index d13db35b46d..45c06c0cb48 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -3032,7 +3032,7 @@ ACE_OS::event_timedwait (ACE_event_t *event,
break;
}
}
-
+
// Reset the auto_event_signaled_ to false now that we have woken up.
if (event->eventdata_->auto_event_signaled_)
event->eventdata_->auto_event_signaled_ = false;
diff --git a/ACE/ace/OS_NS_devctl.h b/ACE/ace/OS_NS_devctl.h
index 40621d00859..c1ed2975b90 100644
--- a/ACE/ace/OS_NS_devctl.h
+++ b/ACE/ace/OS_NS_devctl.h
@@ -1,7 +1,7 @@
#ifndef ACE_OS_NS_DEVCTL_H
#define ACE_OS_NS_DEVCTL_H
-#include "ace/pre.h"
+#include /**/ "ace/pre.h"
#include "ace/config-all.h"
#ifndef ACE_LACKS_PRAGMA_ONCE
@@ -36,5 +36,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# include "ace/OS_NS_devctl.inl"
#endif
-#include "ace/post.h"
+#include /**/ "ace/post.h"
#endif // ACE_OS_NS_DEVCTL_H
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index ad79f1bcb3d..36ba22b8ae2 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -345,9 +345,9 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v)
o << tv->tv_sec;
if (tv->tv_usec)
#ifdef ACE_HAS_CPP11
- o << '.' << std::setw (6) << std::abs (tv->tv_usec);
+ o << '.' << std::setw (6) << std::labs (tv->tv_usec);
#else
- o << '.' << std::setw (6) << ACE_STD_NAMESPACE::abs (tv->tv_usec);
+ o << '.' << std::setw (6) << ACE_STD_NAMESPACE::labs (tv->tv_usec);
#endif
}
else if (tv->tv_usec < 0)
diff --git a/ACE/ace/config-face-safety.h b/ACE/ace/config-face-safety.h
index 68a06084360..28e15124cb3 100644
--- a/ACE/ace/config-face-safety.h
+++ b/ACE/ace/config-face-safety.h
@@ -6,7 +6,7 @@
// In ace/config.h, #define ACE_FACE_SAFETY_BASE or ACE_FACE_SAFETY_EXTENDED
// Optionally #define ACE_FACE_DEV
// ACE_FACE_DEV is a development mode setting which produces an ACE library
-// that allows ACE_DEBUG (doesn't enforce ACE_NDEBUG) and ACE_OS::getenv().
+// that allows debug logging (doesn't enforce ACE_NDEBUG) and ACE_OS::getenv().
// Maintaining this header:
// This version of the header is written for FACE technical standard 2.1.
diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm
index e705b222ba6..6cea0d96b74 100644
--- a/ACE/bin/PerlACE/TestTarget.pm
+++ b/ACE/bin/PerlACE/TestTarget.pm
@@ -192,7 +192,7 @@ sub GetConfigSettings ($)
$self->{TEST_ROOT} = $ENV{$env_name};
} else {
$self->{TEST_ROOT} = $self->{ACE_ROOT};
- }
+ }
$env_name = $env_prefix.'TEST_FSROOT';
if (exists $ENV{$env_name}) {
@@ -461,7 +461,7 @@ sub LocalEnvDir ($)
return $newdir;
}
-# Convert a file in current directory to be local to the target
+# Convert a file in current directory to be local to the target
sub LocalFile ($)
{
my $self = shift;
diff --git a/ACE/tests/MT_SOCK_Test.cpp b/ACE/tests/MT_SOCK_Test.cpp
index 634dacd0737..10a2466163b 100644
--- a/ACE/tests/MT_SOCK_Test.cpp
+++ b/ACE/tests/MT_SOCK_Test.cpp
@@ -335,7 +335,7 @@ spawn (int num_clients)
// Break out of 'for' loop.
break;
case 0:
- ACE_LOG_MSG->sync ("MT_SOCK_Test-child");
+ ACE_LOG_MSG->sync (ACE_TEXT ("MT_SOCK_Test-child"));
client (&server_addr);
ACE_OS::exit (0);
/* NOTREACHED */
diff --git a/ACE/tests/SOCK_Send_Recv_Test.cpp b/ACE/tests/SOCK_Send_Recv_Test.cpp
index 69dfc7a84fa..eeb406cb1cf 100644
--- a/ACE/tests/SOCK_Send_Recv_Test.cpp
+++ b/ACE/tests/SOCK_Send_Recv_Test.cpp
@@ -402,7 +402,7 @@ spawn (void)
1));
/* NOTREACHED */
case 0:
- ACE_LOG_MSG->sync ("SOCK_Send_Recv_Test-child");
+ ACE_LOG_MSG->sync (ACE_TEXT ("SOCK_Send_Recv_Test-child"));
client (&server_addr);
ACE_OS::exit (0);
/* NOTREACHED */
diff --git a/ACE/tests/UUID_Test.cpp b/ACE/tests/UUID_Test.cpp
index 69e21433d73..7585d6b173e 100644
--- a/ACE/tests/UUID_Test.cpp
+++ b/ACE/tests/UUID_Test.cpp
@@ -54,13 +54,13 @@ Tester::test (void)
-1);
// Check the hash value of the 2 UUIDs
-
+
if (new_uuid.hash () != new_uuid_assign.hash ())
ACE_ERROR_RETURN ((LM_ERROR,
ACE_TEXT ("Error: hash value of UUIDs are ")
ACE_TEXT ("not the same")),
-1);
-
+
#else
const ACE_Utils::UUID &new_uuid = *uuid;
#endif
View Lorry Controller Status