[icinga-checkins] icinga.org: icinga2/master: Fixed some more compiler warnings ( when using -Wall).

git at icinga.org git at icinga.org
Fri Feb 1 19:02:19 CET 2013


Module: icinga2
Branch: master
Commit: 8a469e190fd06a93b389a63f775301f10f514e37
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=8a469e190fd06a93b389a63f775301f10f514e37

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Fri Feb  1 19:02:07 2013 +0100

Fixed some more compiler warnings (when using -Wall).

---

 lib/base/streamlogger.cpp |    2 ++
 lib/base/tlsstream.cpp    |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/base/streamlogger.cpp b/lib/base/streamlogger.cpp
index be85af7..89508dc 100644
--- a/lib/base/streamlogger.cpp
+++ b/lib/base/streamlogger.cpp
@@ -89,6 +89,8 @@ void StreamLogger::ProcessLogEntry(ostream& stream, bool tty, const LogEntry& en
 			case LogCritical:
 				stream << "\x1b[1;31m"; // red
 				break;
+			default:
+				break;
 		}
 	}
 
diff --git a/lib/base/tlsstream.cpp b/lib/base/tlsstream.cpp
index 646ae0e..b8f46c7 100644
--- a/lib/base/tlsstream.cpp
+++ b/lib/base/tlsstream.cpp
@@ -31,8 +31,8 @@ bool I2_EXPORT TlsStream::m_SSLIndexInitialized = false;
  * @param sslContext The SSL context for the client.
  */
 TlsStream::TlsStream(const Stream::Ptr& innerStream, TlsRole role, shared_ptr<SSL_CTX> sslContext)
-	: m_InnerStream(innerStream), m_SSLContext(sslContext), m_Role(role),
-	  m_SendQueue(boost::make_shared<FIFO>()), m_RecvQueue(boost::make_shared<FIFO>())
+	: m_SSLContext(sslContext), m_SendQueue(boost::make_shared<FIFO>()), m_RecvQueue(boost::make_shared<FIFO>()),
+	  m_InnerStream(innerStream), m_Role(role)
 {
 	m_InnerStream->OnDataAvailable.connect(boost::bind(&TlsStream::DataAvailableHandler, this));
 	m_InnerStream->OnClosed.connect(boost::bind(&TlsStream::ClosedHandler, this));





More information about the icinga-checkins mailing list