Fixed some compiler warnings.

diff --git a/base/dictionary.cpp b/base/dictionary.cpp
index 4b3c61678bcb5c5750645943b3b605baee7aea90..432609d42a0f1cb72952bdffbac521294d75c4bd 100644 (file)
--- a/base/dictionary.cpp
+++ b/base/dictionary.cpp
@@ -81,8 +81,6 @@ void Dictionary::Set(const String& key, const Value& value)
        ret = m_Data.insert(make_pair(key, value));
        if (!ret.second)
                ret.first->second = value;
-
-       OnItemModified(key, value);
 }
 
 /**
@@ -164,8 +162,6 @@ void Dictionary::Remove(const String& key)
                return;
 
        m_Data.erase(it);
-
-       OnItemModified(key, Empty);
 }
 
 /**
@@ -177,8 +173,6 @@ void Dictionary::Remove(Dictionary::Iterator it)
 {
        String key = it->first;
        m_Data.erase(it);
-
-       OnItemModified(key, Empty);
 }
 
 /**
@@ -226,5 +220,3 @@ cJSON *Dictionary::ToJson(void) const
        return json;
 }
 
-void Dictionary::OnItemModified(const String& key, const Value& value)
-{ }

diff --git a/base/dictionary.h b/base/dictionary.h
index 76ee95d502b62dd899da7ce0cacc78fa58049040..63eb166dbf90033374ec5de6ba2066df0d98147c 100644 (file)
--- a/base/dictionary.h
+++ b/base/dictionary.h
@@ -53,8 +53,6 @@ public:
        static Dictionary::Ptr FromJson(cJSON *json);
        cJSON *ToJson(void) const;
 
-       virtual void OnItemModified(const String& key, const Value& value);
-
 private:
        map<String, Value> m_Data;
 };

diff --git a/base/dynamicobject.cpp b/base/dynamicobject.cpp
index fd7c8131609148ca68767f924c3d2a0fcae05fa0..a2d94cfa10f9837953093d4dd6569ce1da9e0499 100644 (file)
--- a/base/dynamicobject.cpp
+++ b/base/dynamicobject.cpp
@@ -521,5 +521,6 @@ void DynamicObject::FinishTx(void)
        m_CurrentTx = 0;
 }
 
-void DynamicObject::OnAttributeChanged(const String& name, const Value& oldValue)
+void DynamicObject::OnAttributeChanged(const String&, const Value&)
 { }
+

diff --git a/base/ioqueue.h b/base/ioqueue.h
index 8388ccd0a1a74467581275317f3627a1d05718ec..3ec17185cff17361370b6cdc954d977f72509f0b 100644 (file)
--- a/base/ioqueue.h
+++ b/base/ioqueue.h
@@ -70,4 +70,4 @@ public:
 
 }
 
-#endif /* IOQUEUE_H */
\ No newline at end of file
+#endif /* IOQUEUE_H */

diff --git a/base/object.h b/base/object.h
index 571b7d5d86e5762f40f0636d944f3acb0d93be95..59c469161bfb72bf4580726762008d02e6de68b2 100644 (file)
--- a/base/object.h
+++ b/base/object.h
@@ -86,7 +86,7 @@ protected:
 
 private:
        Object(const Object& other);
-       Object operator=(const Object& rhs);
+       Object& operator=(const Object& rhs);
 
        static mutex m_Mutex;
        static vector<Object::Ptr> m_HeldObjects;

diff --git a/base/process.h b/base/process.h
index b4bc5cc9bd118f92b462b3ec7df13901a6cdd795..e9af6c804cc0bc103b02145e5f372dd1dfef6b0e 100644 (file)
--- a/base/process.h
+++ b/base/process.h
@@ -37,7 +37,7 @@ public:
        typedef shared_ptr<Process> Ptr;
        typedef weak_ptr<Process> WeakPtr;
 
-       static const int MaxTasksPerThread = 128;
+       static const deque<Process::Ptr>::size_type MaxTasksPerThread = 128;
 
        Process(const String& command);
 

diff --git a/base/ringbuffer.cpp b/base/ringbuffer.cpp
index 03c7a494fc562c7c6b6eb434a6e1a2d438525ea9..cc8d559bd9fa56ce5672edac2eaf8b076c52f6d3 100644 (file)
--- a/base/ringbuffer.cpp
+++ b/base/ringbuffer.cpp
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.                               *
  *                                                                            *
  * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
+ * aRingBuffer::SizeType with this program; if not, write to the Free Software Foundation     *
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
@@ -21,16 +21,16 @@
 
 using namespace icinga;
 
-RingBuffer::RingBuffer(long slots)
+RingBuffer::RingBuffer(RingBuffer::SizeType slots)
        : m_Slots(slots, 0), m_Offset(0)
 { }
 
-long RingBuffer::GetLength(void) const
+RingBuffer::SizeType RingBuffer::GetLength(void) const
 {
        return m_Slots.size();
 }
 
-void RingBuffer::InsertValue(long tv, int num)
+void RingBuffer::InsertValue(RingBuffer::SizeType tv, int num)
 {
        vector<int>::size_type offsetTarget = tv % m_Slots.size();
 
@@ -47,7 +47,7 @@ void RingBuffer::InsertValue(long tv, int num)
        m_Slots[m_Offset] += num;
 }
 
-int RingBuffer::GetValues(long span) const
+int RingBuffer::GetValues(RingBuffer::SizeType span) const
 {
        if (span > m_Slots.size())
                span = m_Slots.size();

diff --git a/base/ringbuffer.h b/base/ringbuffer.h
index 5ab581a4e9dc0ea0c9f4020cb2ce88386191e550..fc85a8cbe70e44b28b17374cd6a04067fc4b1962 100644 (file)
--- a/base/ringbuffer.h
+++ b/base/ringbuffer.h
@@ -26,15 +26,17 @@ namespace icinga
 class I2_BASE_API RingBuffer
 {
 public:
-       RingBuffer(long slots);
+       typedef vector<int>::size_type SizeType;
 
-       long GetLength(void) const;
-       void InsertValue(long tv, int num);
-       int GetValues(long span) const;
+       RingBuffer(SizeType slots);
+
+       SizeType GetLength(void) const;
+       void InsertValue(SizeType tv, int num);
+       int GetValues(SizeType span) const;
 
 private:
        vector<int> m_Slots;
-       vector<int>::size_type m_Offset;
+       SizeType m_Offset;
 };
 
 }

diff --git a/base/tcpclient.cpp b/base/tcpclient.cpp
index 9e980406c2c2328c57fb8d9f50a974b75fa0f244..14ac23fa22c4d40b02d93bd6092ab8ed857d2f1b 100644 (file)
--- a/base/tcpclient.cpp
+++ b/base/tcpclient.cpp
@@ -27,8 +27,9 @@ using namespace icinga;
  * @param role The role of the TCP client socket.
  */
 TcpClient::TcpClient(TcpClientRole role)
-       : m_Role(role), m_SendQueue(boost::make_shared<FIFO>()),
-         m_RecvQueue(boost::make_shared<FIFO>())
+       : m_SendQueue(boost::make_shared<FIFO>()),
+         m_RecvQueue(boost::make_shared<FIFO>()),
+         m_Role(role)
 { }
 
 /**

diff --git a/base/tlsclient.cpp b/base/tlsclient.cpp
index 111bc2850367978b07b0e9d79f784d31df2fa41e..80eb61ca7e8b1fc5f87572ce6fae19dd290aa97f 100644 (file)
--- a/base/tlsclient.cpp
+++ b/base/tlsclient.cpp
@@ -73,16 +73,6 @@ void TlsClient::Start(void)
        Socket::Start();
 }
 
-/**
- * Takes a certificate as an argument. Does nothing.
- *
- * @param certificate An X509 certificate.
- */
-void TlsClient::NullCertificateDeleter(X509 *certificate)
-{
-       /* Nothing to do here. */
-}
-
 /**
  * Retrieves the X509 certficate for this client.
  *
@@ -92,7 +82,7 @@ shared_ptr<X509> TlsClient::GetClientCertificate(void) const
 {
        mutex::scoped_lock lock(m_SocketMutex);
 
-       return shared_ptr<X509>(SSL_get_certificate(m_SSL.get()), &TlsClient::NullCertificateDeleter);
+       return shared_ptr<X509>(SSL_get_certificate(m_SSL.get()), &Utility::NullDeleter);
 }
 
 /**

diff --git a/base/utility.cpp b/base/utility.cpp
index dc0e7b2e75f45109063fc26404228f193a200faf..79ae91ad83180bbe5da61a9a0fd62be7ea653b32 100644 (file)
--- a/base/utility.cpp
+++ b/base/utility.cpp
@@ -249,9 +249,9 @@ String Utility::BaseName(const String& path)
 /**
  * Null deleter. Used as a parameter for the shared_ptr constructor.
  *
- * @param obj The object that should be deleted.
+ * @param -- The object that should be deleted.
  */
-void Utility::NullDeleter(void *obj)
+void Utility::NullDeleter(void *)
 {
        /* Nothing to do here. */
 }

diff --git a/dyn/config_parser.cc b/dyn/config_parser.cc
index 068902ac7eabafbaa82a8ee169bc161f31929dd7..a5550ba8914c2e263775cf36984e96b634d2c37a 100644 (file)
--- a/dyn/config_parser.cc
+++ b/dyn/config_parser.cc
@@ -208,7 +208,7 @@ typedef struct YYLTYPE
 
 int yylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 
-void yyerror(YYLTYPE *locp, ConfigCompiler *context, const char *err)
+void yyerror(YYLTYPE *locp, ConfigCompiler *, const char *err)
 {
        stringstream message;
        message << *locp << ": " << err;

diff --git a/dyn/config_parser.yy b/dyn/config_parser.yy
index a9a6e716f469fe8821f3bb644bc6feb9612c1fc9..fc639bef568187f47a9be6466a86d733f62ec31d 100644 (file)
--- a/dyn/config_parser.yy
+++ b/dyn/config_parser.yy
@@ -66,7 +66,7 @@ using namespace icinga;
 
 int yylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 
-void yyerror(YYLTYPE *locp, ConfigCompiler *context, const char *err)
+void yyerror(YYLTYPE *locp, ConfigCompiler *, const char *err)
 {
        stringstream message;
        message << *locp << ": " << err;