Compilation fixes for gcc.

diff --git a/base/dictionary.cpp b/base/dictionary.cpp
index 4ec935bc64138c93c5f752ffc6a83207e207fe55..1f69feb27e81968762648bbd0a4fb94efd1e1f52 100644 (file)
--- a/base/dictionary.cpp
+++ b/base/dictionary.cpp
@@ -27,7 +27,7 @@ bool Dictionary::GetValueString(string key, string *value)
        if (!GetValueVariant(key, &data))
                return false;
 
-       *value = data;
+       *value = static_cast<string>(data);
        return true;
 }
 

diff --git a/jsonrpc/jsonrpcclient.h b/jsonrpc/jsonrpcclient.h
index 449fb8c1c51c85fbcee72276cdf7052282ac1b0a..2ad6f343176dd6ca5358dea0596f54d0d7a0e1c3 100644 (file)
--- a/jsonrpc/jsonrpcclient.h
+++ b/jsonrpc/jsonrpcclient.h
@@ -9,7 +9,7 @@ struct I2_JSONRPC_API NewMessageEventArgs : public EventArgs
        typedef shared_ptr<NewMessageEventArgs> Ptr;
        typedef weak_ptr<NewMessageEventArgs> WeakPtr;
 
-       Message Message;
+       icinga::Message Message;
 };
 
 class I2_JSONRPC_API JsonRpcClient : public TCPClient

diff --git a/jsonrpc/netstring.h b/jsonrpc/netstring.h
index 1895b1037dc9d67af764df03908d9aa054dade91..7e3d2dbba4326a90a6bb090710b35052d897f66e 100644 (file)
--- a/jsonrpc/netstring.h
+++ b/jsonrpc/netstring.h
@@ -10,7 +10,7 @@ private:
        size_t m_Length;
        void *m_Data;
 
-       static Dictionary::Ptr Netstring::GetDictionaryFromJson(cJSON *json);
+       static Dictionary::Ptr GetDictionaryFromJson(cJSON *json);
        static cJSON *GetJsonFromDictionary(const Dictionary::Ptr& dictionary);
 
 public: