summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2011-12-05 12:29:55 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2011-12-05 12:29:55 +0000
commite8bc8ddfa317edcc6132f501f194ccec90ffe9df (patch)
treed8b02181a30cee4b84b666ce75e5014d38643359
parentf0755c6e637d3fc1cbea8d0ca5fc6c6ee3bd8a01 (diff)
downloadATCD-e8bc8ddfa317edcc6132f501f194ccec90ffe9df.tar.gz
Mon Dec 5 12:27:54 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/TTY_IO.h: Doxygen fix * ace/config-linux.h: Layout changes * tests/Cached_Accept_Conn_Test.h: * tests/Cached_Accept_Conn_Test.cpp: * tests/MEM_Stream_Test.cpp: * tests/QtReactor_Test.cpp: Layout changes and removed some ACE_UNUSED_ARG usage
-rw-r--r--ACE/ChangeLog14
-rw-r--r--ACE/ace/TTY_IO.h2
-rw-r--r--ACE/ace/config-linux.h1
-rw-r--r--ACE/tests/Cached_Accept_Conn_Test.cpp5
-rw-r--r--ACE/tests/Cached_Accept_Conn_Test.h1
-rw-r--r--ACE/tests/MEM_Stream_Test.cpp3
-rw-r--r--ACE/tests/QtReactor_Test.cpp11
7 files changed, 19 insertions, 18 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index c35e883b3af..d15f6d876f4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,17 @@
+Mon Dec 5 12:27:54 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/TTY_IO.h:
+ Doxygen fix
+
+ * ace/config-linux.h:
+ Layout changes
+
+ * tests/Cached_Accept_Conn_Test.h:
+ * tests/Cached_Accept_Conn_Test.cpp:
+ * tests/MEM_Stream_Test.cpp:
+ * tests/QtReactor_Test.cpp:
+ Layout changes and removed some ACE_UNUSED_ARG usage
+
Mon Dec 5 11:25:31 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/cleanbuilds.sh:
diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h
index 501bacceeca..d3f165eca23 100644
--- a/ACE/ace/TTY_IO.h
+++ b/ACE/ace/TTY_IO.h
@@ -46,7 +46,7 @@ public:
{
Serial_Params (void);
- /** Specifies the baudrate at which the communnication port operates. */
+ /** Specifies the baudrate at which the communication port operates. */
int baudrate;
/** Specifies the minimum number of bytes in input buffer before XON char
is sent. Negative value indicates that default value should
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 7730ab02029..45c1a0e7989 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -371,7 +371,6 @@
# endif
#endif
-
#define ACE_HAS_SVR4_DYNAMIC_LINKING
#define ACE_HAS_AUTOMATIC_INIT_FINI
#define ACE_HAS_DLSYM_SEGFAULT_ON_INVALID_HANDLE
diff --git a/ACE/tests/Cached_Accept_Conn_Test.cpp b/ACE/tests/Cached_Accept_Conn_Test.cpp
index c7a7877db96..1cda7d29263 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.cpp
+++ b/ACE/tests/Cached_Accept_Conn_Test.cpp
@@ -33,8 +33,6 @@
#pragma warning(disable:4503)
#endif /* _MSC_VER */
-
-
// Note: To keep both sunCC5.0 without debugging symbols and gcc2.7.3
// happy, it was necessary to have the definitions of the methods of
// the Accept_Strategy before the instantiations.
@@ -59,8 +57,7 @@ template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> int
Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::open (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
bool restart)
{
- int result = ACCEPT_STRATEGY_BASE::open (local_addr,
- restart);
+ int result = ACCEPT_STRATEGY_BASE::open (local_addr, restart);
if (result == 0)
return result;
diff --git a/ACE/tests/Cached_Accept_Conn_Test.h b/ACE/tests/Cached_Accept_Conn_Test.h
index c1ca61d74f0..e11880ba668 100644
--- a/ACE/tests/Cached_Accept_Conn_Test.h
+++ b/ACE/tests/Cached_Accept_Conn_Test.h
@@ -100,7 +100,6 @@ typedef ACE_NOOP_Concurrency_Strategy<Client_Svc_Handler>
typedef ACE_Cached_Connect_Strategy_Ex<Client_Svc_Handler, ACE_SOCK_CONNECTOR, CACHING_STRATEGY, ATTRIBUTES, ACE_SYNCH_NULL_MUTEX>
CACHED_CONNECT_STRATEGY;
-
template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
class Accept_Strategy : public ACE_Accept_Strategy<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>
{
diff --git a/ACE/tests/MEM_Stream_Test.cpp b/ACE/tests/MEM_Stream_Test.cpp
index 66d13ae085e..14b1fa6bc4f 100644
--- a/ACE/tests/MEM_Stream_Test.cpp
+++ b/ACE/tests/MEM_Stream_Test.cpp
@@ -13,7 +13,6 @@
*/
//=============================================================================
-
#include "test_config.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
@@ -29,8 +28,6 @@
#include "ace/Singleton.h"
#include "ace/Atomic_Op.h"
-
-
#if (defined (ACE_HAS_THREADS) || defined (ACE_HAS_PROCESS_SPAWN)) && \
(ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1)
diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp
index 0f6cdb1f629..f07b56aacfc 100644
--- a/ACE/tests/QtReactor_Test.cpp
+++ b/ACE/tests/QtReactor_Test.cpp
@@ -265,14 +265,12 @@ ACE_HANDLE DgramHandler::get_handle () const
return peer_.get_handle ();
}
-int DgramHandler::handle_input (ACE_HANDLE handle)
+int DgramHandler::handle_input (ACE_HANDLE)
{
- ACE_UNUSED_ARG (handle);
int recvBuffer;
ACE_INET_Addr peerAddress;
- int result;
- result = peer_.recv (&recvBuffer, sizeof (recvBuffer) , peerAddress);
+ int result = peer_.recv (&recvBuffer, sizeof (recvBuffer) , peerAddress);
if (0 >= result)
ACE_ERROR_RETURN ((LM_ERROR,
@@ -865,11 +863,8 @@ TCPAcceptorHandler::~TCPAcceptorHandler ()
ACE_TRACE ("TCPAcceptorHandler::~TCPAcceptorHandler");
}
-void testNativeReactor (int argc, ACE_TCHAR *argv[])
+void testNativeReactor (int, ACE_TCHAR *[])
{
- ACE_UNUSED_ARG (argc);
- ACE_UNUSED_ARG (argv);
-
ACE_DEBUG ((LM_INFO, ACE_TEXT ("Testing autotest using native reactor\n")));
ACE_Reactor reactor;