diff options
author | Gordon Sim <gsim@apache.org> | 2009-07-20 10:41:29 +0000 |
---|---|---|
committer | Gordon Sim <gsim@apache.org> | 2009-07-20 10:41:29 +0000 |
commit | 3b15e97c5dffa35bc384e2c78e6447c3e6cd903f (patch) | |
tree | f55331e1323b03b89f0dd2b05649dbfbee6ef52c | |
parent | 6c20c25cb8fb24aba314044cb7f884f34cc90a52 (diff) | |
download | qpid-python-3b15e97c5dffa35bc384e2c78e6447c3e6cd903f.tar.gz |
QPID-1993: Patch from Chenta Lee to prevent compiler warnings with GCC 4.3.3
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@795752 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | cpp/src/qmf/ResilientConnection.cpp | 5 | ||||
-rw-r--r-- | cpp/src/qpid/broker/Daemon.cpp | 5 | ||||
-rwxr-xr-x | cpp/src/qpid/sys/posix/LockFile.cpp | 3 | ||||
-rw-r--r-- | cpp/src/tests/ForkedBroker.cpp | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/cpp/src/qmf/ResilientConnection.cpp b/cpp/src/qmf/ResilientConnection.cpp index 66d76266ce..610306f896 100644 --- a/cpp/src/qmf/ResilientConnection.cpp +++ b/cpp/src/qmf/ResilientConnection.cpp @@ -385,7 +385,10 @@ void ResilientConnectionImpl::EnqueueEvent(ResilientConnectionEvent::EventKind k eventQueue.push_back(event); if (notifyFd != -1) - ::write(notifyFd, ".", 1); + { + int unused_ret; //Suppress warnings about ignoring return value. + unused_ret = ::write(notifyFd, ".", 1); + } } diff --git a/cpp/src/qpid/broker/Daemon.cpp b/cpp/src/qpid/broker/Daemon.cpp index 1f79251d2f..aa8dd8855b 100644 --- a/cpp/src/qpid/broker/Daemon.cpp +++ b/cpp/src/qpid/broker/Daemon.cpp @@ -87,10 +87,11 @@ void Daemon::fork() catch (const exception& e) { QPID_LOG(critical, "Daemon startup failed: " << e.what()); uint16_t port = 0; - write(pipeFds[1], &port, sizeof(uint16_t)); + int unused_ret; //Supress warning about ignoring return value. + unused_ret = write(pipeFds[1], &port, sizeof(uint16_t)); std::string pipeFailureMessage = e.what(); - write ( pipeFds[1], + unused_ret = write ( pipeFds[1], pipeFailureMessage.c_str(), strlen(pipeFailureMessage.c_str()) ); diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/cpp/src/qpid/sys/posix/LockFile.cpp index 9ef9a205b7..4900252984 100755 --- a/cpp/src/qpid/sys/posix/LockFile.cpp +++ b/cpp/src/qpid/sys/posix/LockFile.cpp @@ -56,7 +56,8 @@ LockFile::~LockFile() { if (impl) { int f = impl->fd; if (f >= 0) { - (void) ::lockf(f, F_ULOCK, 0); // Suppress warnings about ignoring return value. + int unused_ret; + unused_ret = ::lockf(f, F_ULOCK, 0); // Suppress warnings about ignoring return value. ::close(f); impl->fd = -1; } diff --git a/cpp/src/tests/ForkedBroker.cpp b/cpp/src/tests/ForkedBroker.cpp index ee29926ff8..30c346850c 100644 --- a/cpp/src/tests/ForkedBroker.cpp +++ b/cpp/src/tests/ForkedBroker.cpp @@ -51,7 +51,10 @@ ForkedBroker::~ForkedBroker() { QPID_LOG(error, QPID_MSG("Killing forked broker: " << e.what())); } if (!dataDir.empty()) - ::system(("rm -rf "+dataDir).c_str()); + { + int unused_ret; // Suppress warnings about ignoring return value. + unused_ret = ::system(("rm -rf "+dataDir).c_str()); + } } void ForkedBroker::kill(int sig) { |