From 4d8d6dfe72df7233201ce3a45829c50adc8b07fe Mon Sep 17 00:00:00 2001
From: Grzegorz Krawczyk <g.krawczyk@samsung.com>
Date: Fri, 18 Jan 2013 15:28:46 +0100
Subject: [PATCH] Support for GCC 4.7

Compatibility with GCC v 4.7 is required.

This commit fix problems with compilation GCC 4.7.

[Issue#] N/A
[Bug] The repository causes build break with GCC 4.7
[Cause] N/A
[Solution] Source code adjusted to GCC 4.7

[Verification]
1. Build repository (with current version = 4.5)

Change-Id: I78ef8c986dd811841605d0e1b18fc641343287e3
---
 modules/db/src/orm.cpp                     | 1 +
 modules/dbus/src/connection.cpp            | 2 +-
 modules/event/include/dpl/event/property.h | 2 +-
 modules/log/src/old_style_log_provider.cpp | 1 +
 modules/utils/src/wrt_utility.cpp          | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/db/src/orm.cpp b/modules/db/src/orm.cpp
index 1d2f6b4..acdbcca 100644
--- a/modules/db/src/orm.cpp
+++ b/modules/db/src/orm.cpp
@@ -22,6 +22,7 @@
 #include <stddef.h>
 #include <dpl/db/orm.h>
 
+
 namespace DPL {
 namespace DB {
 namespace ORM {
diff --git a/modules/dbus/src/connection.cpp b/modules/dbus/src/connection.cpp
index c9b7f8e..53d992c 100644
--- a/modules/dbus/src/connection.cpp
+++ b/modules/dbus/src/connection.cpp
@@ -109,7 +109,7 @@ Connection::~Connection()
 
     std::for_each(m_registeredObjects.begin(),
                   m_registeredObjects.end(),
-                  [m_connection] (const RegisteredObjects::value_type& value)
+                  [this] (const RegisteredObjects::value_type& value)
                   {
                       g_dbus_connection_unregister_object(
                               m_connection,
diff --git a/modules/event/include/dpl/event/property.h b/modules/event/include/dpl/event/property.h
index 7c87e50..2817007 100644
--- a/modules/event/include/dpl/event/property.h
+++ b/modules/event/include/dpl/event/property.h
@@ -511,7 +511,7 @@ public:
 
         this->m_storage.Set(value);
 
-        EmitEvent(PropertyEvent<Type>(value, this->m_model),
+        this->EmitEvent(PropertyEvent<Type>(value, this->m_model),
                   EmitMode::Auto);
     }
 
diff --git a/modules/log/src/old_style_log_provider.cpp b/modules/log/src/old_style_log_provider.cpp
index 2ad499f..bd7db2b 100644
--- a/modules/log/src/old_style_log_provider.cpp
+++ b/modules/log/src/old_style_log_provider.cpp
@@ -26,6 +26,7 @@
 #include <cstring>
 #include <sstream>
 #include <sys/time.h>
+#include <unistd.h>
 
 namespace DPL
 {
diff --git a/modules/utils/src/wrt_utility.cpp b/modules/utils/src/wrt_utility.cpp
index 9bb2187..43888b3 100644
--- a/modules/utils/src/wrt_utility.cpp
+++ b/modules/utils/src/wrt_utility.cpp
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <errno.h>
 #include <ctype.h>
+#include <unistd.h>
 #include <dpl/log/log.h>
 #include <dpl/utils/wrt_utility.h>
 
-- 
2.7.4