From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Wed, 18 Apr 2012 13:51:17 +0000 (+0200)
Subject: Compilation fixes for gcc.
X-Git-Tag: v0.0.1~623
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9bf1c3b7560a9e34c43b561c83f7d94e2938927;p=icinga2

Compilation fixes for gcc.
---

diff --git a/base/dictionary.cpp b/base/dictionary.cpp
index 4ec935bc6..1f69feb27 100644
--- 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 449fb8c1c..2ad6f3431 100644
--- 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 1895b1037..7e3d2dbba 100644
--- 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: