summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@ociweb.com>2015-03-02 13:48:17 -0600
committerAdam Mitz <mitza@ociweb.com>2015-03-02 13:48:17 -0600
commit3b69762dc8298b0cc284d873bb3c62896f341a12 (patch)
treed7aedaa14a007163a888571723788813b433f3c4
parentaac642374d4f97d4525084a743c2b638731b658b (diff)
parentbcc16db982b483171996f2dfcedb132741c163f7 (diff)
downloadATCD-3b69762dc8298b0cc284d873bb3c62896f341a12.tar.gz
Merge remote-tracking branch 'upstream/master'
-rw-r--r--ACE/ace/OS_NS_Thread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index b760a9a07a4..2eeb79a580b 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -5162,7 +5162,7 @@ spa (FUNCPTR entry, ...)
if (argc >= ACE_MAX_ARGS && argv[ACE_MAX_ARGS - 1] != 0)
{
// Try to read another arg, and warn user if the limit was exceeded.
- //
+ //
// Note that the VxWorks shell arguments change from int to long when
// using a 64bit compiler. Cast the argument up so that the format
// specifier remains correct for either build type.