From 2bcadbb42a6fb2f096c1fc0a4b957d64a5024ef6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 11 Oct 2006 15:50:15 +0000 Subject: Turned up gcc warnings, fixed warnings in code, enabled -Werror. Note: #include "qpid_test_plugin.h" instead of Works around warning from a cppunit macro. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@462834 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/common/io/inc/APRConnector.h | 2 +- cpp/common/io/inc/ConnectorImpl.h | 4 ++-- cpp/common/io/inc/LFProcessor.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/common/io/inc') diff --git a/cpp/common/io/inc/APRConnector.h b/cpp/common/io/inc/APRConnector.h index c292c4d7e0..c6ed887f78 100644 --- a/cpp/common/io/inc/APRConnector.h +++ b/cpp/common/io/inc/APRConnector.h @@ -68,7 +68,7 @@ namespace io { void checkIdle(apr_status_t status); void writeBlock(qpid::framing::AMQDataBlock* data); - void writeToSocket(char* data, int available); + void writeToSocket(char* data, size_t available); void setSocketTimeout(); void run(); diff --git a/cpp/common/io/inc/ConnectorImpl.h b/cpp/common/io/inc/ConnectorImpl.h index 242f3aed49..1abb72f32a 100644 --- a/cpp/common/io/inc/ConnectorImpl.h +++ b/cpp/common/io/inc/ConnectorImpl.h @@ -32,7 +32,7 @@ namespace io { { public: - ConnectorImpl(bool debug = false, u_int32_t buffer_size = 1024):APRConnector(debug,buffer_size){}; + ConnectorImpl(bool _debug = false, u_int32_t buffer_size = 1024):APRConnector(_debug,buffer_size){}; virtual ~ConnectorImpl(){}; }; #else @@ -40,7 +40,7 @@ namespace io { { public: - ConnectorImpl(bool debug = false, u_int32_t buffer_size = 1024):LConnector(debug, buffer_size){}; + ConnectorImpl(bool _debug = false, u_int32_t buffer_size = 1024):LConnector(_debug, buffer_size){}; virtual ~ConnectorImpl(){}; }; diff --git a/cpp/common/io/inc/LFProcessor.h b/cpp/common/io/inc/LFProcessor.h index 8cfbd237a3..6e67268906 100644 --- a/cpp/common/io/inc/LFProcessor.h +++ b/cpp/common/io/inc/LFProcessor.h @@ -48,12 +48,12 @@ namespace io { const apr_pollfd_t* signalledFDs; int count; const int workerCount; + bool hasLeader; qpid::concurrent::Thread** const workers; qpid::concurrent::APRMonitor leadLock; qpid::concurrent::APRMonitor countLock; qpid::concurrent::APRThreadFactory factory; std::vector sessions; - bool hasLeader; volatile bool stopped; const apr_pollfd_t* getNextEvent(); -- cgit v1.2.1